Merge branch 'master' of https://github.com/viggy-smalls/scheduling

Conflicts:
	student.c