Updated progress bar
Merge branch 'master' of github.com:mwein/RunningApp

Conflicts:
	PaceBeat/gen/edu/msu/weinmatt/pacebeat/R.java
Merge branch 'master' of github.com:mwein/RunningApp
Added xml file for progress bar