commas are for real bro
Merge branch 'master' of github.com:akerl/blog

Conflicts:
	Gemfile