login karma working
Merge branch 'adding-session-params'

Conflicts:
	app/actions.rb
	config/database.rb
	db/db.sqlite3
fixing login karma