Merge remote-tracking branch 'origin/master'

Conflicts:
	build/classes/util/CourseTable.class
	src/util/CourseTable.java
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/util/CourseTable.java