update git with all our work
test
Merge branch 'master' of https://github.com/IntroHCIGroup2/chores

Conflicts:
	routes/add.js
	routes/password.js
	views/chore-completed.handlebars
	views/home.handlebars