I think I accidently did this in my master branch
oops nothing changed here
Merge branch 'master' into dchan_dev
yay, moved my changes from master to my branch -.-
Yay, progress in health calculation.  TestEnemy is buggy
I commented out the TestEnemy. Muahahaha
Merge branch 'dchan_dev' into mkchu_dev
damage over time, refactoring
get rid of timer changing to stopwatch
first ailment
object pool class
generic object pool, one ailment/particle, enemyManager use objectPool now
more ailments
forgot the prefabs for last commit
changed clocks to use milliseconds
getting ready to merge
merged
level01_mkchu good
merged
Merge pull request #3 from mkchu243/mkchu_dev

Mkchu dev