commit by dustoki_philwei
Merge pull request #1 from philweigeomatics/master

second commit from philweigeomatics
Merge branch 'master' of https://github.com/dustoki-philwei/test_github

# By Phil Wei
# Via Phil Wei (1) and dustoki-philwei (1)
* 'master' of https://github.com/dustoki-philwei/test_github:
  second commit from philweigeomatics

Conflicts:
	test.html
double modify test.html
second time modify testhhtml
Merge pull request #1 from dustoki-philwei/master

Commit from dustoki_philwei