added user wagers page
fixed merge conflicts
Merge pull request #41 from davidmferris/admin

Admin