2014.11.23 작업
Merge branch 'master' of https://github.com/lely1234/testNam.git