Wout: init commit
Merge branch 'master' of https://github.com/frostraver/Ip2_Concept2

Conflicts:
	Game1.cs
Wout: init commit 2