stupid git
damn git
Merge branch 'master' of https://github.com/szhou1/uFit.git

Conflicts:
	src/com/ufit/activity/MainActivity.java