fir
sec
Merge branch 'dev'

Conflicts:
	.idea/workspace.xml
	app/views/posts/new.html.erb