beginning control flow fixed
Merge branch 'master' of https://github.com/moiri-gamboni/travellog

Conflicts:
	assets/js/controllers.coffee
	assets/js/index.coffee
	static/js/controllers.js
	static/js/index.js