stashing
Merge branch 'master' of https://github.com/bbbgscott/Black_Thorn
Merge branch 'master' of https://github.com/bbbgscott/Black_Thorn
fixed map bug