Fully functional for in app, except data resets with rotation
Merge remote-tracking branch 'origin/master'

Conflicts:
	MyApplication/app/src/main/java/ubhacking/thumbpedometer/MyActivity.java
Fully functional for in app, except data resets with rotation