Updated MonthCalendar
Fixing Merge Problem
Fixing Merge Conflicts--Chris
Merge branch 'dev' of https://github.com/CS3733Team1/wpi-suite into dev
Merge branch 'dev' of https://github.com/CS3733Team1/wpi-suite into dev
Merge branch 'dev' of https://github.com/CS3733Team1/wpi-suite into dev

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
Merge branch 'dev' of https://github.com/CS3733Team1/wpi-suite into dev
Merge branch 'dev' of https://github.com/CS3733Team1/wpi-suite into dev

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.