Merge branch 'master' of C:\Users\Alex\Documents\GitHub\ThumbPedo with conflicts.
Merge remote-tracking branch 'origin/master'

Conflicts:
	MyApplication/app/src/main/java/ubhacking/thumbpedometer/Touchable.java
Merge remote-tracking branch 'origin/master'
Velocity Functionality