gemlock
Merge branch 'master' of github.com:SpencerCDixon/spencerdixon.com

Conflicts:
	Gemfile.lock