Added more png files for root, thorn, and vine
Merge remote-tracking branch 'upstream/master'
Thinking over what's left to accomplish.
Assigned damage dealt to Carly.
Added a very necessary thing to tickets (actually turns).
Added poison.png
In colors, images are loaded
Merge remote-tracking branch 'carly/master'
Merge remote-tracking branch 'daniel/master'

Conflicts:
	rabbit.py
Draft for calculating end game
Rabbits kill flowers and thorns kill rabbits.
Merge remote-tracking branch 'daniel/master'
Merge branch 'master' into simplify

Conflicts:
	unit.py
Moved sprites to sprite directory.
Rendering of images now! Yeah!
Transparent backgrounds for flower and rabbit
Merge remote-tracking branch 'daniel/master'
Thorns die now.
damage and damage over time working