edits to login activity
Merge branch 'master' of https://github.com/ericouyang/cs50-final-project-android

Conflicts:
	Recipes/AndroidManifest.xml
	Recipes/res/values/strings.xml
Merge branch 'master' of https://github.com/ericouyang/cs50-final-project-android