conflict
Merge branch 'master' of https://github.com/umass-cs-326/team-phrase-cards

Conflicts:
	project/app/routes.js
	project/views/index.ejs
reverted changes for login