add render html
Merge branch 'master' of https://github.com/migidomingo/tripplanner

Conflicts:
	assets/day.js
	assets/scripts.js