Merge pull request #1 from breadmj/master

나 1.txt 추가했어요
conflict test
conflict test
merge test
add google analytics code
navbar changed
Merge pull request #2 from loving2days/master

Navbar 수정 및 bootstrap-responsive사용