aa
Merge branch 'master' of
https://github.com/VictorChenLi/BatonStudentAndroid.git

Conflicts:
	src/ca/utoronto/ece1778/baton/screens/MainScreenActivity.java