Merge branch 'master' of https://github.com/viro101/dragon-hunter.git