-
.
Merge branch 'master' of github.com:sawyerh/sawyerh-2013

* 'master' of github.com:sawyerh/sawyerh-2013:
  FF fix
  bigger captions
  light blog pages
  Portfolio piece height bp

Conflicts:
	_includes/header.html
	css/style.css