temp
Merge branch 'master' of https://github.com/anadon/cs3141-calander

Conflicts:
	bin/Control.class
	bin/View.class
	bin/_calander$c_event.class
	bin/_calander.class
	src/Control.java
	src/_calander.java
try 2
test?