logs in fine
register new user works
Merge branch 'master' of https://github.com/cregg/Assignment3

Conflicts:
	src/com/example/assignment3/LoginActivity.java