Still working on collsion detection and response.
Merge branch 'master' of https://github.com/evan-carey/cse167-final.git