Merge origin/master

Conflicts:
	css/style.css
	index.html