Added Jekyll Now
Merge remote-tracking branch 'origin/master'

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

Conflicts:
	_config.yml