help
Merge remote-tracking branch 'origin/master'

Conflicts:
	AttemptNumberThree.v12.suo

	AttemptNumberThree/App_Data/aspnet-AttemptNumberThree-20141022022209.mdf

	AttemptNumberThree/App_Data/aspnet-AttemptNumberThree-20141022022209_log.ldf
	AttemptNumberThree/bin/AttemptNumberThree.dll
	AttemptNumberThree/bin/AttemptNumberThree.pdb

	AttemptNumberThree/obj/Debug/AttemptNumberThree.csproj.FileListAbsolute.txt

	AttemptNumberThree/obj/Debug/AttemptNumberThree.csproj.GenerateResource.Cache

	AttemptNumberThree/obj/Debug/AttemptNumberThree.csprojResolveAssemblyReference.cache
	AttemptNumberThree/obj/Debug/AttemptNumberThree.dll
	AttemptNumberThree/obj/Debug/AttemptNumberThree.pdb

	AttemptNumberThree/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache