no message
Merge branch 'master' of https://github.com/briggslab/briggslab.github.io

Conflicts:
	_posts/2014-07-29-seize-the-summer.markdown