commit before pull/merge
Merge branch 'master' of https://github.com/teamvapour/RGBlend

Conflicts:
	Library/assetDatabase3
	Library/guidmapper
TestHome scene, PlayerGoal added with win/lose conditions, camera movement to show the home position
clean camera movement code
prefab enemies settings changed, maybe they''ll get overwritten by merges :))
assetDatabase commit - should be overwritten
Merge branch 'master' of https://github.com/teamvapour/RGBlend

Conflicts:
	Assets/Prefabs/EnemyPolice.prefab
	Assets/Prefabs/EnemyRiot.prefab
	Assets/Prefabs/EnemyRiot2.prefab
	Assets/Scripts/Behavior/EnemyControl.cs
	Assets/Scripts/MainScene/ColourBarController.cs
	Library/assetDatabase3
	Library/guidmapper
	ProjectSettings/EditorBuildSettings.asset
Merge branch 'master' of https://github.com/teamvapour/RGBlend

Conflicts:
	Library/CurrentLayout.dwlt