merged changes

server/app.py

server/staticVariables.py

server/templating.py

static/css/stylesheet.css

templates/demo.html

templates/foli.html

templates/index.html

templates/info.html

templates/internal/base.html

templates/internal/macros.html

templates/map.html

templates/timetables.html