modified answer.erb
second attempt at this branch thing
new user post route on user controller
make post for login in user controller
adding jquery
realize i'm putting my code in the wrong model (game). moved it to user model.
presentation commit
add bcrypt to gemfile and environment. use session stub in user controller
got bcrypt working
added ability to create decks, with jQuery for form input
merged createdecks branch with master
added vimeo deck support
slight modifications to create deck
pushed deck creation to helper methods
change sessions to work appropriately
Mabcerge branch 'master' of https://github.com/fabianuribe/flashit
completed video parsing
merge conflict resolved