tweaks
work on portfolio page
Merge branch 'master' of github.com:shalperin/blog.samhalperin.com

Conflicts:
	static/css/screen.css
	templates/work.html