Merge branch 'master' of https://github.com/ScaY/Check_n_Cook

Conflicts:
	Check_n_Cook/Check_n_Cook.v12.suo
	Check_n_Cook/Check_n_Cook/obj/Debug/About.g.cs
	Check_n_Cook/Check_n_Cook/obj/Debug/About.g.i.cs
	Check_n_Cook/Check_n_Cook/obj/Debug/About.xaml
	Check_n_Cook/Check_n_Cook/obj/Debug/Check 'n' Cook.exe
	Check_n_Cook/Check_n_Cook/obj/Debug/Check 'n' Cook.pdb

	Check_n_Cook/Check_n_Cook/obj/Debug/Check_n_Cook.csproj.FileListAbsolute.txt
	Check_n_Cook/Check_n_Cook/obj/Debug/XamlTypeInfo.g.cs
	Check_n_Cook/Check_n_Cook/obj/Debug/intermediatexaml/Check 'n' Cook.exe
	Check_n_Cook/Check_n_Cook/obj/Debug/intermediatexaml/Check 'n' Cook.pdb