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

Conflicts:
	config/routes.rb

g
settle bet
Merge pull request #34 from zelzel2315/bet

pre pull comiit