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

Conflicts:
	app/controllers/members_controller.rb
Merge branch 'master' of github.com:kantoliinary/kantoliina

Conflicts:
	app/controllers/members_controller.rb
testeja tehty
Merge branch 'master' of github.com:kantoliinary/kantoliina