created a sprite library
Merge branch 'master' of https://github.com/duke-compsci308-spring2013/vooga
fixed merge conflict
Merge branch 'scrolling_platformer'
added example scroller to games package
we can now use mario, llama, or walama for animation of player