Implemented email addresses and automatic adding of .edu email addresses to uploaders
Merge branch 'master' of github.com:johnwm47/487-Project

Conflicts:
	CS487Project/data.sqlite
Moved files in order to merge
Fixing my last commits