styled
css'ing it
ajaxed card and feedback view
remove form after submitting answer
fixed a bug where answers weren't saving
Added progress info
resolved merge conflicts
trying to fix merge conflicts
fixed feedback.erb merge conflicte
Added logout button, a few more styling changes, logout route index.eb
Attempt to fix merge conflict

Merge branch 'master' into css

Conflicts:
	app/controllers/index.rb
Merge pull request #12 from Hello-Maja/css

Css