Swag update
Merge remote-tracking branch 'origin/master'

Conflicts:
	css/style.css
	img/GitHub-Mark-blue.png
	img/bird_blue_48.png
	index.html