20141229 v1.0.0 -narae
main 충돌해결