view updates
Merge branch 'master' into matt-game-crud
Added instance variables
merged conflicts
preliminary dashboard.erb and dashboard.rb
dashboard.erb and dashboard.rb for review by group at after 4PM checkin
gameplay not working
updated CRUD for decks and cards
resolved local merge conflicts
Merge pull request #9 from 4justinstewart/Ron-homepageJS

Ron homepage js
Resolved merge conflicts, working dashboard view
Merge pull request #10 from 4justinstewart/matt-game-crud

Matt game crud
Merge pull request #11 from 4justinstewart/gameplay

Gameplay
trying to recover stash
ajax returning username and password
Getting pass/fail indication, not routing to dashboard
JS for login