Druk het naar het limiet
Merge branch 'master' of https://github.com/Snakybo/GameJam2014

Conflicts:
	Assets/Resources/Prefabs/Player 1.prefab
	Assets/Resources/Prefabs/Player 2.prefab
	Assets/Scripts/Player/Player.cs
	Assets/_Scenes/GameScene.unity
Merge branch 'master' of https://github.com/Snakybo/GameJam2014