Test merge conflict resolution, branch.
Merge branch test.
Test
Merge branch 'master' of https://github.com/jacantera/CalendarPal into MergeTest
Merge branch 'master' of https://github.com/jacantera/CalendarPal into MergeTest

Conflicts:
	MainForm.cs