Merge branch 'master' of https://github.com/vicox/soundblog

Conflicts:
	_includes/footer.html
	about.md
Merge remote-tracking branch 'origin/master'