New changes.
Merge branch 'scroller_kirby' of github.com:duke-compsci308-spring2013/vooga into scroller_kirby
Added more states. Kirby can now ingest enemies.