Merge remote-tracking branch 'origin/master'
Merge branch 'master' of github.com:arnobroekhof/dynboot
Changed ignore of settings.py