changed 2 line notice and redirect to single line, changed case redirection to redirect_to :back
fix cucumber tests
cucumber fix
rearrange methods
fix rspec
moved more to models, cleaned up code
Merge pull request #90 from joh641/refactor

cleaned up and reorganized code