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

Conflicts:
	app/assets/stylesheets/member.css.scss
otsikot
Merge branch 'master' of github.com:kantoliinary/kantoliina