blog_post added
Merge remote-tracking branch 'origin/feature' into feature

Conflicts:
	app/views/welcome/index.html.haml