login sivun routet
Merge branch 'master' of https://github.com/kantoliinary/kantoliina
session controller ja testit korjattu
Merge branch 'master' of https://github.com/kantoliinary/kantoliina

Conflicts:
	spec/factories/admin.rb