Tryign to push changes.
Merge branch 'master' of https://github.com/kknevitt/Beat-Your-Pace.git
Trying to fix errors
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_