walking exercise
Merge branch 'master' of git@github.com:andresperezl/heartbooth.git

Conflicts:
	src/edu/usf/csee/heartbooth/gui/WalkingExerciseActivity.java
Merge branch 'master' of git@github.com:andresperezl/heartbooth.git
walking exercise pretty much finished
Merge branch 'master' of git@github.com:andresperezl/heartbooth.git