updating to XNA 4
Merge branch 'master' of https://github.com/JamesEdSmith/gamedev

Conflicts:
	Pike-shot/CondottiereWars/PikeAndShot.csproj.Release.cachefile