safe
Mmerge erge branch 'safe'

Conflicts:
	app/assets/stylesheets/posts_index.css