Updating default settings.py generated and README.md
Merge branch 'master' into feature/items
Fixed physics and collision detection