[Task] bak
Merge branch 'master' of https://github.com/markusfalk/vhosts-homepage

Conflicts:
	.gitignore
[Task] add margin bottom to last list