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

Conflicts:
	src/com/example/myfirstapp/Workout.java
- Added Workout History
	- I modified some of the database code
	
- Altered the algorithm 
	- See email
workout history activity. Updated workout choices. Updated algorithm.
Implemented a simple warm up feature
Merge branch 'master' of https://github.com/HasibShakur/CardioFit.git

Conflicts:
	src/com/example/myfirstapp/EditProfile.java
	src/com/example/myfirstapp/Workout.java
implemented upgrade and downgrade desired heart range
added 'error' state when heart monitor is giving non-sensical data
Implemented timeWithinDesiredRange and timeWithinAdjustedRange. 
Just waiting on Hasib to update the database so I can save it.
additionaly changes regarding timeWithinRange
added some commented code that Hasib can un-comment when he has
implemented the database changes
Merge branch 'master' of https://github.com/HasibShakur/CardioFit.git
Small updates:
Calorie counter fixed.
desired and adjusted time within implemented