fixed routing for username
Merge branch 'master' into create-deck
Decks Model
Recreated pivot table and tidied up roots
Controller for decks and files for viewing/ creating decks
update to the latest changes
Form for creating a new deck
create a deck looks pretty now yay
Users can create a deck and the correct information is in the database and pivot table
changes
Resolving merger conflict
Merge remote-tracking branch 'refs/remotes/origin/master'