css updates
Merge branch 'master' of https://github.com/xsinclair/dhox_stamp

Conflicts:
	css/screen.css
	index.html