test
Merge remote-tracking branch 'origin/master' into test

# By JHIH-YA CHEN
# Via JHIH-YA CHEN
* origin/master:
  hello!

Conflicts:
	hi
Merge pull request #1 from xtony77/test

Test