Fixed corgis and did something with the map. I can't remember
Merge branch 'master' of https://github.com/RBMNT/RBstation2
Stuffs