not sure what changes were made but just in case
Merge branch 'master' into zel

need to merge
commit ?
create userbet1 and 2 in bet controller
Merge pull request #27 from zelzel2315/zachbranch

create userbet1 and 2 in bet controller
messing around the bet and user bet controllers
not trying to merge these just need to push
shitty changes, don't pull
so many broken features I may just abandom this branch
Merge branch 'master' of https://github.com/zelzel2315/PayUp2

my shit is so fucked
can create bet in bet form on users new view and assign challenger and challengee
Merge pull request #28 from zelzel2315/betbranch

can create bet in bet form on users new view and assign challenger and c...
Merge branch 'master' of https://github.com/zelzel2315/PayUp2

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

ok
do not push this branch
we can now make a bet that saves in the db
Merge pull request #29 from zelzel2315/bet

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

changing the master
not much to change, do not push
do not push