Adding pages
Merge branch 'master' into gh-pages

Conflicts:
	css/main.css
	sass/layout/_work.scss
Merge branch 'master' into gh-pages
fixed url of browser-test in details popup