monkey test merge .unity file
Merge branch 'master' of https://github.com/Metsa/KingWasSick

Conflicts:
Assets/Scenes/GameScene.unity
Library/assetDatabase3
Merge branch 'master' of https://github.com/Metsa/KingWasSick

Conflicts:
	Assets/Scenes/GameScene.unity
	Library/assetDatabase3