uusi nappula
Merge branch 'master' of github.com:kantoliinary/kantoliina

Conflicts:
	spec/controllers/members_controller_spec.rb