first commit
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.
solidified deck and card creation workflow and controllers
commented out unsure routes
commit migrations
Experimenting with Bootstrap
add migrations
Merge branch 'model'
deck and card creation routes down
Merge branch 'model'
Merge branch 'master' 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.
Merge pull request #1 from oconn/deck_controllers

Deck controllers
Merge branch 'master' of https://github.com/oconn/Deck-Of-Cards
add user show routes
Merge pull request #2 from oconn/user

add user show routes
Merge branch 'master' of https://github.com/oconn/Deck-Of-Cards
add sign-in sign-out to user controller