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

Conflicts:
	BeatYourPace/src/com/example/beatyourpace/TestPushedClass.java
Music Player code
Merge branch 'master' of https://github.com/kknevitt/Beat-Your-Pace.git