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

Conflicts:
	Gemfile
Merge branch 'master' of https://github.com/jlwbps/jlwbps.github.io

Conflicts:
	Gemfile