Merge pull request #1 from KwonHyukMin/master

맵올림
TankMoving
Merge pull request #2 from Kim-Knagtae/master

2번