migration
Merge pull request #4 from JackMarx/redhood

migration
put header and sidebar in layout
putting user and deck logic into views
Merging with master
Merge pull request #5 from JackMarx/card_data

Card Data Integration Into Templates
Merging With Master