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

Conflicts:
	BeatYourPace/gen/com/example/beatyourpace/R.java
Merge branch 'master' of https://github.com/kknevitt/Beat-Your-Pace