accept Nov. 21 2013
accept Nov 26
Merge branch 'master' of https://github.com/siriwardenap/Comp231

Conflicts:
	CulinaryDelight/CulinaryDelight.v11.suo
	CulinaryDelight/CulinaryDelight/bin/CulinaryDelight.dll
	CulinaryDelight/CulinaryDelight/bin/CulinaryDelight.pdb
	CulinaryDelight/CulinaryDelight/obj/Debug/CulinaryDelight.csproj.FileListAbsolute.txt
	CulinaryDelight/CulinaryDelight/obj/Debug/CulinaryDelight.csprojResolveAssemblyReference.cache
	CulinaryDelight/CulinaryDelight/obj/Debug/CulinaryDelight.dll
	CulinaryDelight/CulinaryDelight/obj/Debug/CulinaryDelight.pdb
	CulinaryDelight/CulinaryDelight/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	CulinaryDelight/UnitTestCulinaryDelight/UnitTest1.cs
	CulinaryDelight/UnitTestCulinaryDelight/bin/Debug/CulinaryDelight.dll
	CulinaryDelight/UnitTestCulinaryDelight/bin/Debug/CulinaryDelight.pdb
	CulinaryDelight/UnitTestCulinaryDelight/bin/Debug/UnitTestCulinaryDelight.dll
	CulinaryDelight/UnitTestCulinaryDelight/bin/Debug/UnitTestCulinaryDelight.pdb
	CulinaryDelight/UnitTestCulinaryDelight/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	CulinaryDelight/UnitTestCulinaryDelight/obj/Debug/UnitTestCulinaryDelight.csproj.FileListAbsolute.txt
	CulinaryDelight/UnitTestCulinaryDelight/obj/Debug/UnitTestCulinaryDelight.csprojResolveAssemblyReference.cache
	CulinaryDelight/UnitTestCulinaryDelight/obj/Debug/UnitTestCulinaryDelight.dll
	CulinaryDelight/UnitTestCulinaryDelight/obj/Debug/UnitTestCulinaryDelight.pdb