dev changes, email works
Merge branch 'master' of https://github.com/jeanniet13/EECS394

Conflicts:
	StudyMoney/public/index.html