refactor
Merge branch 'master' of github.com:domasx2/scifiroguelike