Made Changes to file
Merge branch 'master' of
https://github.com/srizzling/NWEN304AssignmentOne

Conflicts:
	[NWEN304]TimetableReader/bin/[NWEN304]TimetableReader.apk
	[NWEN304]TimetableReader/bin/classes.dex
	[NWEN304]TimetableReader/bin/resources.ap_