February 27, 2014 4_47pm

Got the enemies bouncing back and stuff when they get hit.  The burrower
now gets destroyed upon getting hit.  Enemies now spawn based on both
one-time triggers and timers.
Merge pull request #2 from ScrambledEgge101/master

February 27, 2014 4_47pm
Unknown changes
Jason rocks

He knows why
please work Merge remote-tracking branch 'upstream/master'

Conflicts:
	TrickyNinja/TrickyNinja/build_Data/Managed/Assembly-CSharp.dll
	TrickyNinja/TrickyNinja/build_Data/PlayerConnectionConfigFile
	TrickyNinja/TrickyNinja/build_Data/mainData
	TrickyNinja/TrickyNinja/build_Data/output_log.txt
	TrickyNinja/TrickyNinja/build_Data/sharedassets0.assets
Merge pull request #3 from ScrambledEgge101/master

Jason rocks
stavenMerge remote-tracking branch 'upstream/master'

Conflicts:
	TrickyNinja/TrickyNinja/ProjectSettings/EditorBuildSettings.asset