Added ability to merge weapon animation with character animation.
Added debug bounding boxes around the sprites.
Added ability to merge weapon animation with character animation.
Merge branch 'master' of https://github.com/hurricanerix/transylvania

Conflicts:
	transylvania/sprite.py