Getting new site
Merge branch 'master' of https://github.com/th0ran/richard_ii

Conflicts:
	css/style.css
	index.html
Bad sync