title
xtc
ju
Merge branch 'master' of https://github.com/mbronsema/koshinkai

Conflicts:
	app/views/categories/edit.html.erb
	app/views/categories/postnew.html.erb
	app/views/categories/show.html.erb
	app/views/posts/new.html.erb
	app/views/posts/show.html.erb