Added text views that display current speed and current bpm
Merge branch 'master' of github.com:mwein/RunningApp

Conflicts:
	PaceBeat/src/edu/msu/weinmatt/pacebeat/PaceBeat.java
	PaceBeat/src/edu/msu/weinmatt/pacebeat/PaceBeatActivity.java