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

Conflicts:
	BeatYourPace/src/com/GC01/BeatYourPace/MusicPlayer/MusicPlayer.java
Merge branch 'master' of https://github.com/kknevitt/Beat-Your-Pace
Pushing the new layout test.
Merge branch 'master' of https://github.com/kknevitt/Beat-Your-Pace.git

Conflicts:
	BeatYourPace/gen/com/example/beatyourpace/R.java
	BeatYourPace/src/com/GC01/BeatYourPace/MusicPlayer/MusicPlayer.java