xz
Merge branch 'master' of github.com:ShilGen/quick_content

Conflicts:
	css/index.css
edit after merge