this is apart fromthe master
added a basic movement script
made adjustments to camera
added box assets and modified the camera
added a cube Prefab
modefied values to the x and y camera margins
Merge pull request #1 from vsanchez1987/victor

Victor
merged with master
Merge branch 'master' into Omar

Conflicts:
	SpacePizza_Main/Library/ScriptAssemblies/Assembly-CSharp.dll
	SpacePizza_Main/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	SpacePizza_Main/Library/assetDatabase3
	SpacePizza_Main/Library/guidmapper
Merge branch 'Omar'
Merge branch 'master' into victor

Conflicts:
	SpacePizza_Main/Library/assetDatabase3
	SpacePizza_Main/SpacePizza_Main-csharp.sln
	SpacePizza_Main/SpacePizza_Main.sln
testing
made a comment
added a comment
added blank varaible
Merge pull request #4 from vsanchez1987/man1

added a blank varialble
added a JS file that does nothing
Merge pull request #5 from vsanchez1987/gitTesting

added a JS file that does nothing
Merge branch 'master' into Omar

Conflicts:
	SpacePizza_Main/Library/CurrentLayout.dwlt
	SpacePizza_Main/Library/ScriptAssemblies/Assembly-CSharp.dll
	SpacePizza_Main/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	SpacePizza_Main/Library/assetDatabase3
	SpacePizza_Main/Library/expandedItems
	SpacePizza_Main/Library/guidmapper
	SpacePizza_Main/Library/metadata/ce/ce7e16b18049749599cd376308c1765c
	SpacePizza_Main/Temp/UnityTempFile-17bfa47b9150d420db2c5f12063a9937
	SpacePizza_Main/Temp/UnityTempFile-847d4ffd8f62c49d19c819d1e91d07e1
	SpacePizza_Main/Temp/UnityTempFile-8f55876f49dfb40e08f2373f7c836f42
	SpacePizza_Main/Temp/UnityTempFile-c8652d1c2f4414edbb623090fb86c27d
	SpacePizza_Main/Temp/UnityTempFile-cfc592e2e5b5046b6af08021faf12a68
	SpacePizza_Main/Temp/UnityTempFile-e50f438749c454a2d9efd7ff468e26e0
	SpacePizza_Main/Temp/UnityTempFile-f355e76d542d643dd80be7bb34ceb35d
Merge branch 'Omar'