Spawnig set
2-10-2014 1631
more
Merge remote-tracking branch 'upstream/master'

Conflicts:
	TrickyNinja/Assets/Prefabs/PlayerPrefabs/PlayerStuff 1.prefab
	TrickyNinja/Assets/ShurikenMagic/Models/Materials/No Name.mat
	TrickyNinja/TrickyNinja.userprefs
steven
Merge pull request #26 from DevenSmith/master

steve
newmaster
CleanedUp Prefabs and stuff
Merge remote-tracking branch 'upstream/master'

Conflicts:
	TrickyNinja/Assets/Scenes/JasonScene-2.unity
	TrickyNinja/Assets/ShurikenMagic/Models/Materials/No Name.mat
	TrickyNinja/TrickyNinja.userprefs
Merge branch 'master' of https://github.com/ScrambledEgge101/TrickyNinja-2