loading works
conflict merge
Merge branch 'scrolling_platformer' of https://github.com/duke-compsci308-spring2013/vooga into scrolling_platformer
changed size of platform sprite