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

Conflicts:
	spec/controllers/member_controller_spec.rb
Merge branch 'master' of github.com:kantoliinary/kantoliina
z
Merge branch 'master' of github.com:kantoliinary/kantoliina

Conflicts:
	app/controllers/members_controller.rb
	app/models/member.rb
	spec/controllers/member_controller_spec.rb
Aakkostuunausta!
Merge branch 'master' of github.com:kantoliinary/kantoliina

Conflicts:
	app/models/member.rb