changed user to email
added new user database
Merge branch 'master' of https://github.com/edenzik/128Project