Final layout changes
Merge branch 'master' of https://github.com/rstana/projektor

Conflicts:
	app/assets/stylesheets/static.css.scss
	app/views/static/index.html.erb

Final changes