non-working map
Merge branch 'master' of https://github.com/bbbgscott/Black_Thorn