Settings merge
Merge branch 'master' of github.com:niamu/heroi.cc