Calendar Additions
Merge remote-tracking branch 'origin/master'

Conflicts:
	KayakHomePage/KayakHomePage.v12.suo
	KayakHomePage/KayakHomePage/MainWindow.xaml
	KayakHomePage/KayakHomePage/bin/Debug/KayakHomePage.exe
	KayakHomePage/KayakHomePage/bin/Debug/KayakHomePage.pdb
	KayakHomePage/KayakHomePage/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	KayakHomePage/KayakHomePage/obj/Debug/KayakHomePage.csproj.FileListAbsolute.txt
	KayakHomePage/KayakHomePage/obj/Debug/KayakHomePage.exe
	KayakHomePage/KayakHomePage/obj/Debug/KayakHomePage.g.resources
	KayakHomePage/KayakHomePage/obj/Debug/KayakHomePage.pdb
	KayakHomePage/KayakHomePage/obj/Debug/KayakHomePage_MarkupCompile.cache
	KayakHomePage/KayakHomePage/obj/Debug/KayakHomePage_MarkupCompile.i.cache
	KayakHomePage/KayakHomePage/obj/Debug/MainWindow.baml
	KayakHomePage/KayakHomePage/obj/Debug/MainWindow.g.cs
	KayakHomePage/KayakHomePage/obj/Debug/MainWindow.g.i.cs

Trying to commit a merge