commiting to merge
Merge branch 'master' of https://github.com/nicgarner/IBMS

Conflicts:
	Timetable.java
supervisor interface generate roster