Design Changes, removed SharedPrefs because it pissed me off
design
Merge branch 'master' of https://github.com/cpiggott/codedaykc.git

Conflicts:
	CodeDayKCRunningApp/res/layout/activity_main.xml
	CodeDayKCRunningApp/res/layout/activity_workout.xml
	CodeDayKCRunningApp/src/com/example/codedaykcrunningapp/MainActivity.java