fixed merge conflict that I forgot to fix
Merge pull request #10 from chrisjeon/sessions_controller_fix

fixed merge conflict that I forgot to fix