Ahhhh shit
Fixed?
Fixed conflict
Fixed sign up on click
Made it so the login xml has no history
Modified manifest for testing purposes
Merge conflict resolution.
Merge branch 'master' of https://github.com/jacobrs/HwrkIt into devss

Conflicts:
	HwrkIt/AndroidManifest.xml
	HwrkIt/bin/AndroidManifest.xml
	HwrkIt/src/com/jabs/hwrkit/MainActivity.java
Added PieChart back into MainActivity for testing (stub)