Merge pull request #36 from zelzel2315/userselect

added accepted and rejected bets to index view
testing the pay up button
Merge branch 'master' of https://github.com/zelzel2315/PayUp2 into button

Conflicts:
	app/models/bet.rb
	app/views/bets/index.html.erb

Trying to move to a new branch
Merge branch 'master' into userselect
Merge pull request #37 from zelzel2315/userselect

commit before pulling show page from master
need to figure out payment
Merge pull request #38 from zelzel2315/button

Button
Merge branch 'master' into userselect

pulling new master into my test branch
pre master pull commit