commit before pull
Merge branch 'master' of https://github.com/kwarnick/kwarnick.github.io

Conflicts:
	Gemfile