Working on edit/new deck forms
Merge branch 'views'
merged conflicts
added stats to user portal
stats on portal complete
fixed some merge conflicts