what i have so far
Merge branch 'master' of https://github.com/nrmilstein/cs4750-project

Conflicts:
	app/View/Users/view.ctp