Commit from local repo
Merge branch 'master' of https://github.com/friedeggs/collisionsim