Both fragments appear on the screen
Merge branch 'master' of https://github.com/Elioht/CalHacks

Conflicts:
	src/com/unsigned/innovations/CalHacks/LoginActivity.java