code formating
Switching to Chipmunk physics
fixing bad merge
Merge pull request #17 from quinnydinny/dev

Chipmunk physics