More fixes, level swap, level layout
4-10-2014 1105

all enemies vanish
Merge remote-tracking branch 'upstream/master'

Conflicts:
	TrickyNinja/Assets/Imported Assets/Meshes/Materials/caveFloor.mat.meta
	TrickyNinja/Assets/Prefabs/PlayerPrefabs/PlayerStuff 1.prefab
	TrickyNinja/Assets/Scenes/LevelOneMultiplayer.unity
	TrickyNinja/Assets/Scripts/Steven's/CameraShake.cs
	TrickyNinja/ProjectSettings/EditorBuildSettings.asset
	TrickyNinja/TrickyNinja.userprefs
4-10-2014 1122
Merge remote-tracking branch 'upstream/master'

Conflicts:
	TrickyNinja/Assets/Scenes/LevelOneMultiplayer.unity
	TrickyNinja/Assets/ShurikenMagic.meta
	TrickyNinja/Assets/ShurikenMagic/Models.meta
	TrickyNinja/Assets/ShurikenMagic/Models/Materials.meta
	TrickyNinja/Assets/ShurikenMagic/ParticleMaterials.meta
	TrickyNinja/Assets/ShurikenMagic/ParticleMaterials/Arrows.meta
	TrickyNinja/Assets/ShurikenMagic/ParticleMaterials/Lights.meta
	TrickyNinja/Assets/ShurikenMagic/ParticleMaterials/Parts.meta
	TrickyNinja/Assets/ShurikenMagic/ParticleMaterials/Rituals.meta
	TrickyNinja/Assets/ShurikenMagic/ParticleMaterials/Smokes.meta
	TrickyNinja/Assets/ShurikenMagic/Scripts.meta
	TrickyNinja/Assets/ShurikenMagic/Shaders.meta
	TrickyNinja/TrickyNinja.userprefs
Merge pull request #25 from DevenSmith/master

4-10-2014 1127
Ignorethisplz
Merge remote-tracking branch 'upstream/master'

Conflicts:
	TrickyNinja/TrickyNinja.userprefs