Merge branch 'master' of https://github.com/duke-compsci308-spring2013/vooga into scrolling_platformer
started creating the StateManager
Added state manager, organized sprite packages
implemented various states. currently testing the invisible state for mario
fixed merge, working on animations
Merge branch 'master' of https://github.com/duke-compsci308-spring2013/vooga into scrolling_platformer
working animations
merged and fixed conflicts in player update
animation is currently working
fixed bugs in animation painting
fixed merge conflicts, reorganized sprites
Added Mario back
Merge branch 'scrolling_platformer' of https://github.com/duke-compsci308-spring2013/vooga into scrolling_platformer
moved level management around, started to implement hp in mario
Merge branch 'scrolling_platformer' of https://github.com/duke-compsci308-spring2013/vooga into scrolling_platformer
Refactored playerPaintLocation
removed local input package
reinstated local input package, whoops
changed pixmap and animation to implement IPaintable which is painted by sprite
changed pixmap and animation to implement IPaintable which is painted by sprite