level work
Merge branch 'master' of https://github.com/cronostorm/ludum

Conflicts:
	Assets/Scenes/level1.unity
level work
more level work...
Merge branch 'master' of https://github.com/cronostorm/ludum

Conflicts:
	Assets/Scripts/GameManager.cs
level