kjh
Committing to pull
committing to pull
Merge branch 'master' of https://github.com/cooliodesuavio/courseez

Conflicts:
	src/Schedule.java
Merge branch 'master' of https://github.com/cooliodesuavio/courseez/

Conflicts:
	src/Schedule.java