commit by dustoki_philwei
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