Working on edit/new deck forms
Merge branch 'views'
merged conflicts
changes made
committing
added stats to user portal
Add flash messages for correct and incorrect, make end round a button
Merge pull request #8 from mbacksmeier/styling

Remove Bootstrap
stats on portal complete
fixed some merge conflicts
Resolve User controller conflict