저장
Merge branch 'master' of https://github.com/Monds/Timple.git
Merge branch 'master' of https://github.com/Monds/Timple.git
사이드바 충돌 수정