can set a text box
Merge remote-tracking branch 'origin/master'

Conflicts:
	MyApplication/app/src/main/java/ubhacking/thumbpedometer/Touchable.java