Merge branch 'master' of https://github.com/zeDoctor/gdd2xna

Conflicts:
	gdd2xna/gdd2xna/src/Game1.cs