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

Conflicts:
	app/assets/stylesheets/application.css
	app/assets/stylesheets/meber.css.scss