at last...
Merge https://github.com/theConscience/webmastering

Conflicts:
	folder#1/test_site/css/style.css
	folder#1/test_site/index.html
remove conflict