Color changes
fix conflicts
Merge branch 'master' of https://github.com/Christopher-Bui/calendar

Conflicts:
	bin/Calendar.class
	bin/Display.class