Visual changes
Visual changes
Merge branch 'master' of https://github.com/ethompson1914/WorkoutKings

Conflicts:
	AndroidManifest.xml
	res/layout/activity_choose_exercises.xml
	res/layout/activity_new_exercise.xml
	res/layout/activity_new_workout.xml
	res/layout/activity_workout.xml
	res/values/strings.xml
	src/lin/thompson/workout/Workout.java
	src/lin/thompson/workoutkings/Activity/ChooseCardsActivity.java
	src/lin/thompson/workoutkings/Activity/ChooseExercisesActivity.java
	src/lin/thompson/workoutkings/Activity/NewWorkoutActivity.java
	src/lin/thompson/workoutkings/Activity/WorkoutActivity.java