Had to commit to pull
Merge branch 'master' of https://github.com/tianyupu/MediTrack

Conflicts:
	src/org/uwhealthkids/MediTrack/SummTFrameActivity.java
Some things changed in SummTFrame
Merge branch 'master' of https://github.com/tianyupu/MediTrack