Gitte
Merge remote-tracking branch 'origin/master'

Conflicts:
	TowerDefence.v12.suo
	TowerDefence/TowerDefence/bin/x86/Debug/TowerDefence.exe
	TowerDefence/TowerDefence/bin/x86/Debug/TowerDefence.pdb
	TowerDefence/TowerDefence/obj/x86/Debug/TowerDefence.exe
	TowerDefence/TowerDefence/obj/x86/Debug/TowerDefence.pdb
Merge branch 'master' of https://github.com/Filipmathias/TestTowerDefence

Conflicts:
	TowerDefence.v12.suo
	TowerDefence/TowerDefence/UIGame.cs