Merge branch 'master' of https://github.com/ShawnStringfield/shawnstringfield.github.io

Signed-off-by: Shawn Stringfield <shawn.stringfield@gmail.com>

Conflicts:
	_config.yml
Merge branch 'master' of https://github.com/ShawnStringfield/shawnstringfield.github.io

Signed-off-by: Shawn Stringfield <shawn.stringfield@gmail.com>

Conflicts:
	_config.yml