No idea what I did
Merge branch 'master' of https://github.com/cooliodesuavio/courseez

Conflicts:
	src/Schedule.java