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
Merge branch 'master' of https://github.com/zelzel2315/PayUp2

shit balls
Merge pull request #24 from zelzel2315/zel

Zel
added bootstrap back
Merge pull request #25 from zelzel2315/zachbranch

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

FUCKSTICKS
adding gem
Merge branch 'master' into zel

need to merge
messing around the bet and user bet controllers