anyway...
Merge branch 'master' of
https://github.com/VictorChenLi/BatonTeacherAndroid.git

Conflicts:
	src/ca/utoronto/ece1778/baton/screens/MainScreenActivity.java
commit
Merge branch 'master' of https://github.com/VictorChenLi/BatonTeacherAndroid.git