starting to implement the 'from file' function
Merge branch 'master' of https://github.com/zaynashahzad/CS151

Conflicts:
	GoogleCalendarProject/src/CalendarFrame.java
	GoogleCalendarProject/src/Controller.java