Merge branch 'master' of C:\Users\Evan\Desktop\SteamMeet with conflicts.
E-mail saves, and login works, email instead of clan