Improvements

changings in html and css files.
Merge remote-tracking branch 'origin/master'

Conflicts:
	CSS/layout.css
	index.html