Merge pull request #2 from onidavin/master

CameraFade fix to help editor
Improved control response and added new wave
Merge branch 'master' of https://github.com/aliceandstuff/davin-game-jam
Merge pull request #3 from onidavin/master

Many updates, fixed rotation, new enemies
Merge branch 'master' of https://github.com/aliceandstuff/davin-game-jam

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

Ryan's Pull Request
Update input manager for xbox controller
More input tweaking
Added first scripted wave spawn
Merge branch 'master' of https://github.com/aliceandstuff/davin-game-jam

Conflicts:
	Assets/Scenes/default.unity
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