Merge branch 'master' of https://github.com/mcwakanda/GitTest

Conflicts:
	GitTest/WebFolder/index.waPage/index.html
	GitTest/WebFolder/index.waPage/styles/index.css