changing shiz
Merge branch 'emailSignUp' of https://github.com/pdemirdjian/jerry-working

Conflicts:
	study-time.py
fixing branch issues (learning git still)