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