Hair
bleh
Merge branch 'master' of https://github.com/jreijrink/2IV15_SICG

Conflicts:
	Project1/Game.cs
	Project1/Interface/MainWindow.cs