created all model and migration files
first commit
added model and migrations
added basic schema fields for all migrations
added basic deck controllers, working on card controllers and add cards view
working on card controllers
deleted view
merged in views

ter' into deck_controllers

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
update gemfile
created validations for all models, added bcrypt gem to gem file for has_secure_password on user model
removed bcrypt from gemfile because matt
added all associations for models
solidified deck and card creation workflow and controllers
Merge branch 'model'
commented out unsure routes
commit migrations
Experimenting with Bootstrap
add migrations
commit before merge
Merge branch 'master' into model