2-10-2014 1631
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