modified:   app.js
Merge branch 'master' of https://github.com/kasuparu/sincemonday

Conflicts:
	app.js