Map merge stub
Typo
Merge branch 'master' of https://github.com/nan0desu/Baystation12