Commiting with venmo
Merge branch 'master' of https://github.com/zelzel2315/PayUp2
dangerous shit
Conflicts:
	app/controllers/venmo_controller.rb
	app/views/venmo/home.html.erb
Merge branch 'master' of https://github.com/zelzel2315/PayUp2

cause I feel like it bitches
fixing bets controller
Merge pull request #23 from zelzel2315/zachbranch

added angular Ctrl App Service to javascript folder
Merge branch 'master' of https://github.com/zelzel2315/PayUp2

shit balls
removing lines from bets controller
Merge pull request #24 from zelzel2315/zel

Zel
Merge pull request #25 from zelzel2315/zachbranch

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

FUCKSTICKS
adding gem
Merge pull request #26 from zelzel2315/zachbranch

added pending and your challenge partials
create userbet1 and 2 in bet controller