Merge pull request #6 from GavinDBrown/master

Testing merge functionality with Justin
testing merge with Gavin
Merge pull request #7 from GavinDBrown/master

Testing merge functionality with Justin
I merged things
Merge pull request #8 from sumnerjj/master

new merge test fun
Fixed update velocity
Fixed bounding box for Sprite2.