Changed from help to settings
changed manifest to delete main.settings
commit of .ignore
Merge branch 'master' of https://github.com/kknevitt/Beat-Your-Pace

Conflicts:
	BeatYourPace/src/com/GC01/BeatYourPace/Main/MainActivity.java
Merge branch 'master' of https://github.com/kknevitt/Beat-Your-Pace 2nd time?

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