small changes
conflict resolve
conflict resolve
capybara-stage1
Merge branch 'master' of https://github.com/losu/match_bets