Merge pull request #25 from DevenSmith/master

4-10-2014 1127
Spawnig set
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