??
Merge branch 'master' of https://github.com/Glarmo/project

Conflicts:
	project police/Assets/Scenes/test.unity
	project police/Library/CurrentLayout.dwlt
	project police/Library/ProjectSettings.asset
	project police/Library/ScriptAssemblies/Assembly-CSharp.dll
	project police/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	project police/Library/assetDatabase3
	project police/Library/expandedItems
	project police/Library/guidmapper
	project police/Temp/UnityTempFile-f156f1063078a42038ea88d478f4a247
camera now has zoom ability
"no camera attached"

Constant error but it does work...
same as before
`??