Fixed layout
fixed layout

Conflicts:
	css/style.css
	index.html