HTML
Merge branch 'master' of https://github.com/grid32/ComputingTimetablePlanner

Conflicts:
	bin/ComputingTimetablePlanner.apk
	bin/classes.dex

bin/classes/com/example/computingtimetableplanner/SemesterActivity$1.cla
ss

bin/classes/com/example/computingtimetableplanner/SemesterActivity$2.cla
ss

bin/classes/com/example/computingtimetableplanner/SemesterActivity$3.cla
ss

bin/classes/com/example/computingtimetableplanner/SemesterActivity$4.cla
ss

bin/classes/com/example/computingtimetableplanner/SemesterActivity$5.cla
ss

bin/classes/com/example/computingtimetableplanner/SemesterActivity$6.cla
ss

bin/classes/com/example/computingtimetableplanner/SemesterActivity.class
	bin/resources.ap_
	src/com/example/computingtimetableplanner/SemesterActivity.java