test 123
Merge branch 'master' of https://github.com/mbronsema/koshinkai

Conflicts:
	app/controllers/posts_controller.rb
	app/views/categories/_formcatpost.html.erb
	app/views/categories/postnew.html.erb
	app/views/posts/home.html.erb