zzz
Merge branch 'master' of github.com:AEWEB/blog

Conflicts:
	Gemfile
	log/development.log