docs
Merge branch 'master' of https://github.com/donJoomla/donjoomla.github.io

Conflicts:
	css/style.css
docs