Ignoring sublime-project files
Merge branch 'development' of github.com:cmonaccio/Scylla
Merge remote-tracking branch 'origin/development'
Merge branch 'refs/heads/development'
Merge branch 'master' of github.com:cmonaccio/Scylla into development