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

Conflicts:
	db/schema.rb
user memberiksi