Updated wave spawn logic
Merge branch 'master' of https://github.com/aliceandstuff/davin-game-jam

Conflicts:
	Assets/Scripts/Game/MasterGameScript.cs
Merge pull request #7 from rgiuliany/master

Updated wave spawn logic