Test
Merge branch 'master' of https://github.com/gcrevell/Calendar.git
Merge branch 'master' of https://github.com/gcrevell/Calendar.git

Conflicts:
	Calendar.ser
Merge branch 'master' of https://github.com/gcrevell/Calendar.git
Fixing Delete