haku
Merge branch 'master' of https://github.com/kantoliinary/kantoliina

Conflicts:
	app/controllers/members_controller.rb