_
Merge branch 'master' of github.com:edmackowiak/ascendancy