update 11/12/14
Merge remote-tracking branch 'origin/master'

Conflicts:

	GrandTheftCandy/GrandTheftCandy/GrandTheftCandy/GrandTheftCandy/GrandTheftCandy.csproj.Debug.cachefile

	GrandTheftCandy/GrandTheftCandy/GrandTheftCandy/GrandTheftCandy/bin/x86/Debug/Content/Resources/Sounds/gameMusic.wma

	GrandTheftCandy/GrandTheftCandy/GrandTheftCandy/GrandTheftCandy/bin/x86/Debug/GrandTheftCandy.exe

	GrandTheftCandy/GrandTheftCandy/GrandTheftCandy/GrandTheftCandy/bin/x86/Debug/GrandTheftCandy.pdb

	GrandTheftCandy/GrandTheftCandy/GrandTheftCandy/GrandTheftCandy/obj/x86/Debug/GrandTheftCandy.csproj.FileListAbsolute.txt

	GrandTheftCandy/GrandTheftCandy/GrandTheftCandy/GrandTheftCandy/obj/x86/Debug/GrandTheftCandy.exe

	GrandTheftCandy/GrandTheftCandy/GrandTheftCandy/GrandTheftCandy/obj/x86/Debug/GrandTheftCandy.pdb

	GrandTheftCandy/GrandTheftCandy/GrandTheftCandy/GrandTheftCandy/obj/x86/Debug/cachefile-{4683467A-31D5-40C3-B012-EE726ED738FB}-targetpath.txt