brendan
Merge branch 'master' of https://github.com/cooliodesuavio/courseez/

Conflicts:
	bin/courseezdriver.class
	src/courseezdriver.java