I am terrible at using git commit --amend
I am terrible at using git commit --amend

Merge branch 'master' of github.com:barryclark/jekyll-now

Conflicts:
	_config.yml

elBradford/elBradford.github.io,elBradford/elBradford.github.io