Wall Fix
Merge pull request #6 from rgiuliany/master

Added scripted spawn
Merge branch 'master' of https://github.com/aliceandstuff/davin-game-jam

Conflicts:
	Assets/Scenes/default.unity
	Assets/Scripts/Game/MasterGameScript.cs
Merge pull request #5 from onidavin/master

Wall Fix
Merge branch 'master' of https://github.com/aliceandstuff/davin-game-jam

Conflicts:
	Assets/Scripts/Game/MasterGameScript.cs