jäsenryhmä taulu
Merge branch 'master' of github.com:kantoliinary/kantoliina

Conflicts:
	app/models/member.rb
	app/views/members/index.html.haml
	db/seeds.rb