working on friend connections
working with contact
Merge branch 'master' of https://github.com/umass-cs-326/team-phrase-cards

Conflicts:
	project/app/routes.js