weekend changes
Merge pull request #39 from davidmferris/wagers_on_user_page

weekend changes
fixed merge conflicts