My version of the step
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/Lab2_203_03.apk
	bin/classes.dex
	bin/classes/ca/uwaterloo/lab2_203_03/GeneralSensorEventListener.class
	src/ca/uwaterloo/lab2_203_03/GeneralSensorEventListener.java