Revert "Really Fixed Conflicts"

Conflicts:

Calendar/src/edu/wpi/cs/wpisuitetng/modules/calendar/controller/MainCale
ndarController.java

Calendar/src/edu/wpi/cs/wpisuitetng/modules/calendar/view/monthview/Mont
hViewGridPanel.java

Calendar/src/edu/wpi/cs/wpisuitetng/modules/calendar/view/monthview/Mont
hViewPanel.java
clean up