Merge branch 'master' of https://github.com/zelzel2315/PayUp2

ahhhh
Merge branch 'master' of https://github.com/zelzel2315/PayUp2

changing the master
Merge pull request #33 from zelzel2315/zel

Zel
pre pull comiit
Merge branch 'master' of https://github.com/zelzel2315/PayUp2 into bet

Conflicts:
	config/routes.rb

g
Merge branch 'master' of https://github.com/zelzel2315/PayUp2

merge orgigin amster
settle bet
Merge pull request #34 from zelzel2315/bet

pre pull comiit
logo showing in nav userselect working in new bet view bootstrap table for bet index view added workflow gem to adjust bet workflow state new workflow state column in bet table
fixed conflict
Merge pull request #35 from zelzel2315/userselect

logo showing in nav userselect working in new bet view bootstrap table f...
added accepted and rejected bets to index view
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

merge
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
commit before pulling show page from master
Merge pull request #37 from zelzel2315/userselect

commit before pulling show page from master
not sure what I changed but don't push
don't push