not sure what changes were made but just in case
Merge branch 'master' into zel

need to merge
messing around the bet and user bet controllers
not trying to merge these just need to push
shitty changes, don't pull
do not push this branch
not much to change, do not push
do not push
added log out button and fixed application files
added log out button and fixed application files
Merge branch 'master' into zel

"need to merge"
Merge pull request #33 from zelzel2315/zel

Zel
Merge branch 'master' of https://github.com/zelzel2315/PayUp2 into bet

Conflicts:
	config/routes.rb

g
settle bet