Man this works
Merge remote-tracking branch 'origin/master'

Conflicts:
	TowerDefence.v12.suo
	TowerDefence/TowerDefence/Game1.cs
	TowerDefence/TowerDefence/bin/x86/Debug/TowerDefence.exe
	TowerDefence/TowerDefence/bin/x86/Debug/TowerDefence.pdb

	TowerDefence/TowerDefence/obj/x86/Debug/ContentPipeline-{C4C061A2-2598-4EB5-BDB0-1FEB5EF1FB39}.xml
	TowerDefence/TowerDefence/obj/x86/Debug/TowerDefence.exe
	TowerDefence/TowerDefence/obj/x86/Debug/TowerDefence.pdb