Merge branch 'master' of github.com:lost-osiris/scott

this is my commit
Merge remote-tracking branch 'origin/master'