Scrolling
Merge branch 'master' of github.com:tanaril/path-graphics
Fix navigation
Merge branch 'master' of github.com:tanaril/path-graphics

Conflicts:
	web/css/site.css
	web/index.html