lalala
Merge branch 'master' of heroku.com:mytripplanner
before demo
but fix