Betting Changes
Merge branch 'master' of https://github.com/xzel/CIS399-Final into marg
Merge branch 'marg' of https://github.com/xzel/CIS399-Final into maz
updated credentials