add wahaha
Merge branch 'master' into issue1
add 嘿嘿嘿
Merge branch 'master' into issue1
在 comment 加上說明
Merge branch 'master' into issue1

Conflicts:
	test.c
add github
Merge branch 'master' into issue1

Conflicts:
	test.c
加上註解 #1