Trying to resolve conflicts
Merge branch 'master' of https://github.com/kknevitt/Beat-Your-Pace.git

Conflicts:
	BeatYourPace/bin/BeatYourPace.apk
	BeatYourPace/bin/classes.dex
	BeatYourPace/bin/resources.ap_
	BeatYourPace/src/com/GC01/BeatYourPace/Main/LetsRunMode.java
Merge branch 'master' of https://github.com/kknevitt/Beat-Your-Pace.git