Chris's app.js
Merge branch 'master' of https://github.com/kesavm/taskur

Conflicts:
	views/index.handlebars