Initialize repository
Merge branch 'master' of https://github.com/drnkly/atlas-armory

merge