added byline
Merge branch 'master' into gh-pages

Conflicts:
	css/default.css