Merge pull request #51 from mellema/master

just making sure we're all up to date, I commented out card.model.js to get rid of error that prevented starting the server
Complete random game generation
merge
Merge pull request #52 from gitMbar/master

Complete random game generation
Start game now generates a game in the database and stores game's _id on localstorage
Merge pull request #53 from gitMbar/master

Start game now generates a game in the database and stores game's _id on...
Implement create game, load game.  One card game can now be played.  (Without results)
Merge pull request #54 from gitMbar/master

Implement create game, load game.  One card game can now be played.  (Wi...
uncomment card model
comment out db populater
All cards now get quizzed.  Correct answer is randomly inserted into one of 4 possible answers
Merge pull request #55 from gitMbar/master

All cards now get quizzed.  Correct answer is randomly inserted into one...
Card model uncommented.  This appears to be causing merge issues
Merge branch 'master' of https://github.com/wcjohnson11/yo-banfa
Merge pull request #56 from gitMbar/master

Card model uncommented
uncomment card model and hardcode mongodb
comment out card model unnecessary
fix english on cardviews
Correct answer randomly mixed into answer list.  User score is tracked
Game fully operational