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

Conflicts:
	app/models/partner.rb
	db/seeds.rb
login to username
Merge branch 'master' of github.com:kantoliinary/kantoliina