Minor changes to the settings to ensure that the main can allow it to be selected and that main is noted as its parent
Hopefully this won't overwrite anything.

I made a minor change to MainActivity also and again GitHub got very
upset. I believe I have removed my changes but am not 100% confident!
trying to get the latest main activity
Merge branch 'master' of https://github.com/kknevitt/Beat-Your-Pace

Conflicts:
	BeatYourPace/bin/BeatYourPace.apk
	BeatYourPace/bin/classes.dex
	BeatYourPace/bin/resources.ap_
	BeatYourPace/src/com/example/beatyourpace/MainActivity.java