Test
More testing.
Merge branch 'master' of https://github.com/jacantera/CalendarPal into MergeTest
Continue merge test.
Merge branch 'master' of https://github.com/jacantera/CalendarPal into MergeTest

Conflicts:
	MainForm.cs