Login functions working
Merge branch 'master' into geoff

Conflicts:
	app/src/main/java/com/hackthenorth/lockmeout/app/HomeActivity.java
merging done
Merge pull request #1 from YixinXiong/geoff

Geoff
Login functions working
Merge branch 'master' into jennifers-branch

Conflicts:
	.idea/workspace.xml
	app/src/main/java/com/hackthenorth/lockmeout/app/HomeActivity.java