start of exercises in templates
Merge branch 'master' of https://github.com/SeniorTeam2014/CampusFit

Conflicts:
	CampusFit/bin/CampusFit.apk
	CampusFit/bin/classes.dex
	CampusFit/bin/classes/com/example/campusfit/MainMenu.class
	CampusFit/bin/classes/com/example/campusfit/R$drawable.class
	CampusFit/bin/classes/com/example/campusfit/R$id.class
	CampusFit/bin/classes/com/example/campusfit/R$layout.class
	CampusFit/bin/classes/com/example/campusfit/R$menu.class
	CampusFit/bin/classes/com/example/campusfit/R$string.class
	CampusFit/bin/classes/com/example/campusfit/R$style.class
	CampusFit/bin/classes/com/example/campusfit/SampleWork.class
	CampusFit/bin/classes/com/example/campusfit/SampleWorkouts.class
	CampusFit/bin/classes/com/example/campusfit/SignUp.class
	CampusFit/bin/classes/com/example/campusfit/Stretches.class
	CampusFit/bin/classes/com/example/campusfit/WarmUp.class
	CampusFit/bin/resources.ap_
	CampusFit/gen/com/example/campusfit/R.java