Still trying to fix issues with deploying to GitHub
Merge branch 'master' of https://github.com/jlwbps/jlwbps.github.io

Conflicts:
	Gemfile