enemy and shit
Merge remote-tracking branch 'origin/josh'

Conflicts:
	ChickenProtector/ChickenProtector/ChickenProtector.csproj
	ChickenProtector/ChickenProtector/ChickenProtector.csproj.Debug.cachefile
	ChickenProtector/ChickenProtector/Screens/PlayScreen.cs
	ChickenProtector/ChickenProtector/bin/x86/Debug/ChickenProtector.exe
	ChickenProtector/ChickenProtector/bin/x86/Debug/ChickenProtector.pdb
	ChickenProtector/ChickenProtector/obj/x86/Debug/ChickenProtector.csproj.FileListAbsolute.txt
	ChickenProtector/ChickenProtector/obj/x86/Debug/ChickenProtector.exe
	ChickenProtector/ChickenProtector/obj/x86/Debug/ChickenProtector.pdb
	ChickenProtector/ChickenProtector/obj/x86/Debug/cachefile-{383B47B6-4715-47FA-88ED-720113DAE56A}-targetpath.txt
	ChickenProtector/ChickenProtectorContent/ChickenProtectorContent.contentproj
fixing merge - 1
merge completed