gaskldfj'
Merge pull request #12 from DevenSmith/master

Merge with jason by SH Onto DS
updating branch Merge remote-tracking branch 'upstream/master' into branch

Conflicts:
	TrickyNinja/TrickyNinja/ProjectSettings/TagManager.asset
March 7, 2014 Noon Build

The noon build of Jason of Ege
Merge remote-tracking branch 'upstream/master'
Merge pull request #13 from ScrambledEgge101/master

Jason March 7, 2014 Noon Build
saving before jason merge
Merge remote-tracking branch 'upstream/master' into branch
March 07, 2014 @ 2:47pm

Created an enemy spawner that does not go based on entering a trigger,
but rather goes based on how close the player is to the spawner. It is
called "Constant Spawner" and has a few more capabilities than the
"Trigger 'Spawner'". I placed a few sample ones around my scene to show
how they work. No mystery numbers inside the code - everything is
controlled by the inspector.
Merge pull request #14 from ScrambledEgge101/master

March 07, 2014 @ 2:47pm
saving before jason merge
Merge remote-tracking branch 'upstream/master' into branch
endofday3/7