Solving conflicts
Merge branch 'master' of https://github.com/kknevitt/Beat-Your-Pace

Conflicts:
	BeatYourPace/src/com/GC01/BeatYourPace/Main/MainActivity.java
	BeatYourPace/src/com/GC01/BeatYourPace/Main/TrainingModeActivity.java