fourth commit
Merge branch 'master' of https://github.com/apedude/castlerage
fourth commit