HouseG1 nu zonder dat je er doorheen kan kijken. Nog bezig met het logo
Temp commit
Merge branch 'master' of https://github.com/dorusleliveld/Zombie-Apocalypse

Conflicts:
	Documentation/Arnold/Unity projects/Modellen/Assets/Materials/Screen Shot 2014-11-19 at 6.50.12 PM.png
	Documentation/Arnold/Unity projects/Modellen/Assets/Materials/Screen Shot 2014-11-19 at 6.50.12 PM.png.meta
	Documentation/Arnold/Unity projects/Modellen/Assets/Models/Materials.meta
	Documentation/Arnold/Unity projects/Modellen/Assets/Models/Materials/Screen Shot 2014-11-19 at 6.50.12 PM.png
	Documentation/Arnold/Unity projects/Modellen/Assets/Models/Materials/Screen Shot 2014-11-19 at 6.50.12 PM.png.meta
	Documentation/Arnold/Unity projects/Modellen/Assets/Models/Zommat/Screen Shot 2014-11-19 at 6.50.12 PM.png
	Documentation/Arnold/Unity projects/Modellen/Assets/Models/Zommat/Screen Shot 2014-11-19 at 6.50.12 PM.png.meta
Init scripts
Huis logo af
Merge remote-tracking branch 'origin'
merge fix
Merge branch 'master' into Basic_game_functionality