so here is most of the level done, well the white boxing part. i also set up the splash page and made a new script for the main manu ui
Programmers! pull this down and worok on LEVEL_1_VER_1.2, thats what i recall i being, it might not be that exact name but you get the point, so everyone work on that scene, save your changes and push to your branch so Daniel tay can merge all of our work together! We need this done by night so go ahead and add all scripts that you have and worked on
Merge remote-tracking branch 'origin/omar'

Conflicts:
	Assets/Scenes/Level_root.unity
	Assets/Scripts/Daniel Tay/Materials.meta
	Library/CurrentLayout.dwlt
	Library/CurrentMaximizeLayout.dwlt
	Library/InspectorExpandedItems.asset
	Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll
	Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll.mdb
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll
	Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll.mdb
	Library/assetDatabase3
	Library/expandedItems
	Library/guidmapper
	Library/metadata/44/449b48f7eb5d87a4baaa5fb73f875a59
	Library/metadata/48/480843759ae5d429485a8535d24a9cbc
	Library/metadata/63/6304f34d094abca42832cd328bb51fbf
	Library/metadata/a9/a9750998e06f04d4b8d96809787e732c
	Temp/Commandpipe
	Temp/FBXMayaExport.mel
	Temp/FBXMayaExport5.mel
	Temp/FBXMayaMain.mel
	Temp/__EditModeScene
merged omars branch
Merge branch 'omar'
daniels updates