trying to re setup good repo for everyone
Merge remote-tracking branch 'origin/master'

Conflicts:
	MyApplication/app/src/main/java/ubhacking/thumbpedometer/Touchable.java
trying to re setup good repo for everyone