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

Conflicts:
	app/views/members/index.html.haml
haun korjaus ja koristelu
Merge branch 'master' of https://github.com/kantoliinary/kantoliina

Conflicts:
	app/assets/stylesheets/member.css.scss