before pulling mikes newest
Merge branch 'master' of github.com:richardshelby/TargetPractice

Conflicts:
	TargetPractice.suo
	TargetPractice/TargetPractice/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	TargetPractice/TargetPracticeContent/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache
Commit before Pull Start Sunday 5/12/2013 12:00P
Merge branch 'master' of github.com:richardshelby/TargetPractice

Conflicts:
	TargetPractice.suo
	TargetPractice/TargetPractice/bin/x86/Debug/Content/Effects/Particle.xnb
	TargetPractice/TargetPractice/bin/x86/Debug/TargetPractice.exe
	TargetPractice/TargetPractice/bin/x86/Debug/TargetPractice.pdb
	TargetPractice/TargetPractice/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	TargetPractice/TargetPractice/obj/x86/Debug/TargetPractice.exe
	TargetPractice/TargetPractice/obj/x86/Debug/TargetPractice.pdb
	TargetPractice/TargetPracticeContent/obj/x86/Debug/ContentPipeline.xml
	TargetPractice/TargetPracticeContent/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	TargetPractice/TargetPracticeContent/obj/x86/Debug/Models/ammo_0.xml
	TargetPractice/TargetPracticeContent/obj/x86/Debug/Models/armature_0.xml
	TargetPractice/TargetPracticeContent/obj/x86/Debug/Models/pigeon_0.xml
	TargetPractice/TargetPracticeContent/obj/x86/Debug/Models/shotgun_0.xml
	TargetPractice/TargetPracticeContent/obj/x86/Debug/Models/spaceship_0.xml
	TargetPractice/TargetPracticeContent/obj/x86/Debug/Models/tripod_0.xml
before 2nd pull sunday
before 3rd
Merge branch 'master' of github.com:richardshelby/TargetPractice

Conflicts:
	TargetPractice.suo
	TargetPractice/TargetPractice/TargetPractice.csproj.Debug.cachefile
	TargetPractice/TargetPractice/bin/x86/Debug/Content/Audio/GameAudio.xgs
	TargetPractice/TargetPractice/bin/x86/Debug/Content/Audio/Sound Bank.xsb
	TargetPractice/TargetPractice/bin/x86/Debug/Content/Audio/Wave Bank.xwb
	TargetPractice/TargetPractice/bin/x86/Debug/Content/Effects/Particle.xnb
	TargetPractice/TargetPractice/bin/x86/Debug/TargetPractice.exe
	TargetPractice/TargetPractice/bin/x86/Debug/TargetPractice.pdb
	TargetPractice/TargetPractice/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	TargetPractice/TargetPractice/obj/x86/Debug/TargetPractice.csproj.FileListAbsolute.txt
	TargetPractice/TargetPractice/obj/x86/Debug/TargetPractice.exe
	TargetPractice/TargetPractice/obj/x86/Debug/TargetPractice.pdb
	TargetPractice/TargetPractice/obj/x86/Debug/cachefile-{309D0BCA-6FE1-403F-8A89-C6F2F018739B}-targetpath.txt
	TargetPractice/TargetPracticeContent/obj/x86/Debug/ContentPipeline.xml
	TargetPractice/TargetPracticeContent/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	TargetPractice/TargetPracticeContent/obj/x86/Debug/Models/ammo_0.xml
	TargetPractice/TargetPracticeContent/obj/x86/Debug/Models/armature_0.xml
	TargetPractice/TargetPracticeContent/obj/x86/Debug/Models/pigeon_0.xml
	TargetPractice/TargetPracticeContent/obj/x86/Debug/Models/shotgun_0.xml
	TargetPractice/TargetPracticeContent/obj/x86/Debug/Models/spaceship_0.xml
	TargetPractice/TargetPracticeContent/obj/x86/Debug/Models/tripod_0.xml