added BPM Calc
Turn down for what
yes
Merge branch 'master' of https://github.com/cpiggott/codedaykc

Conflicts:
	CodeDayKCRunningApp/AndroidManifest.xml
	CodeDayKCRunningApp/bin/AndroidManifest.xml
	CodeDayKCRunningApp/bin/classes/com/example/codedaykcrunningapp/MainActivity$1.class
	CodeDayKCRunningApp/bin/classes/com/example/codedaykcrunningapp/MainActivity.class
	CodeDayKCRunningApp/bin/classes/com/example/codedaykcrunningapp/R$drawable.class
	CodeDayKCRunningApp/bin/classes/com/example/codedaykcrunningapp/R$id.class
	CodeDayKCRunningApp/bin/classes/com/example/codedaykcrunningapp/R$layout.class
	CodeDayKCRunningApp/bin/classes/com/example/codedaykcrunningapp/R$menu.class
	CodeDayKCRunningApp/bin/classes/com/example/codedaykcrunningapp/R$string.class
	CodeDayKCRunningApp/bin/classes/com/example/codedaykcrunningapp/R$style.class
	CodeDayKCRunningApp/gen/com/example/codedaykcrunningapp/R.java
	CodeDayKCRunningApp/res/layout/activity_analyze_music.xml
	CodeDayKCRunningApp/res/layout/activity_main.xml
	CodeDayKCRunningApp/res/layout/activity_splash.xml
	CodeDayKCRunningApp/res/layout/activity_workout.xml
	CodeDayKCRunningApp/res/values/strings.xml
	CodeDayKCRunningApp/src/com/example/codedaykcrunningapp/LoadingListener.java
	CodeDayKCRunningApp/src/com/example/codedaykcrunningapp/MainActivity.java
	CodeDayKCRunningApp/src/com/example/codedaykcrunningapp/SongBase.java
	CodeDayKCRunningApp/src/com/example/codedaykcrunningapp/Splash.java
	CodeDayKCRunningApp/src/com/example/codedaykcrunningapp/Workout.java