New commit
Merge branch 'master' of github.com:Ysgard/ashesofatlantis.net