Text UI is under way
Merge branch 'eventManager' into calenderUI

Conflicts:
	src/com/cs3141/calender/EventManager.java