commmit local files before pulling changes
Merge branch 'master' of https://github.com/stickperson/movieday

Conflicts:
	app/static/js/application.js
	app/templates/index.html