Added more png files for root, thorn, and vine
Merge remote-tracking branch 'upstream/master'
Added poison.png
In colors, images are loaded
created damage, progressed on abilities, fixed one obstical bug
dmg over time inplace but partialy broken
Merge remote-tracking branch 'carly/master'
Merge remote-tracking branch 'daniel/master'

Conflicts:
	rabbit.py