Very important.src.asm
Made changes to support animation
Oh yeah... animation.
Broken merge
Merge branch 'master' of https://github.com/heidi-ann/zygote
Merged
Merge branch 'master' of https://github.com/heidi-ann/zygote

Conflicts:
	maps/final_challenge.tmx
	src/challenge_helper.cpp
	src/engine.cpp
	src/map_object.hpp
	src/sprite.cpp
Merged... again...