- added prompts to save workout/discard workout
- small layout changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/example/myfirstapp/Workout.java