knowledge work & overlay
Merge branch 'master' of https://github.com/hbs-dev/tempgit

Conflicts:
	css/styles.css