Update on events.
Calendar Fully Functional!
Calendar Fully Functional!
Merge origin/caltest into caltest

Conflicts:
	src/GUI/BrainiacGUI.java (Resolved)