movements
merge conflicts
making Image friends with Arena
Merge branch 'master' of https://github.com/Math273Project/SuperMarioBros
fixing movement
Merge branch 'master' of https://github.com/Math273Project/SuperMarioBros
messing with movement
combining code