starting out
Merge branch 'master' of github.com:ifeins/lunchtime

Conflicts:
	app/assets/javascripts/templates/application.js.hjs