changes to my blog
Merge branch 'master' of https://github.com/jamesalexanderdickerson/jamesalexanderdickerson.github.io

Conflicts:
	_config.yml