Merge pull request #4 from zelzel2315/peter

Merge pull request #3 from zelzel2315/master
Merge pull request #5 from zelzel2315/master

pull
Merge pull request #6 from zelzel2315/Cris2Branch

Merge pull request #5 from zelzel2315/master
creation of index edit new and show views for users and bets
Merge branch 'master' of https://github.com/zelzel2315/Peer-Challenge into peter

This is merging the existing changes from yesterday into the master