Merge pull request #1 from hahahame/master

xxx
Merge pull request #2 from piercalex/joe

Joe
joe edit
joe 合并完毕
add a
Merge pull request #3 from hahahame/master

add c
master合并完毕
Merge pull request #5 from piercalex/master

master合并完毕