Merge branch 'develop' into 'master'

Update hello.txt Write a comment or drag your files here... See merge request !1

Merge branch 'develop' into 'master'
e7e3757f · BaekSeungHyun · 221fed85 · cd6dc0c6 · e7e3757f
Commit e7e3757f authored 8 years ago by BaekSeungHyun
--- a/hello.txt
+++ b/hello.txt
-hahaha edit hello seunghyun edit
+develop branch hahaha edit hello seunghyun edit