Added camera controls, started Level 1
Level 1 progress, fixed GameManager bug

GameManager had nested if statement missing brackets, causing game to
attempt to pick up every gameObject as a weapon. Fixed
Merge branch 'master' of https://github.com/TrofSivart/GHNBgame1

Conflicts:
	Assembly-CSharp.pidb
	Assets/Scenes/travisTest.unity
	Assets/Scripts/Player.cs
	GHNBgame1.userprefs
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/assetDatabase3
	Library/expandedItems
	Library/guidmapper
	Library/metadata/22/22cae29eaf5234b77afed28e6061a7d9
	Library/metadata/42/42999dcd9ecd9438eb87f379b65d083f
	Library/metadata/4f/4f78e15925f3242abbd6d4116bbd9991
	Library/metadata/8d/8d091443a7f43435296b93141515752f
	Library/metadata/c1/c1d5d008c557b4917bf0efd97ec20cec
	ProjectSettings/TagManager.asset