merging from master branch
Merge branch 'master' of heroku.com:goodbets
profile gets stuff
profile gets stuff
Merge branch 'master' of https://github.com/rmathew1992/compCharity
merging from master branch
merging from nitya
adding db.sqlite to the gitignore
can run
Renamed Bet model to Chipin
Merge pull request #9 from rmathew1992/nitya-fix

Nitya fix
Merge branch 'master' of https://github.com/rmathew1992/compCharity into bet2chipin

Conflicts:
	db.sqlite3
delete empty [] user
Renamed Bet model to Chipin
delete empty [] user
added is_challenger field
Merge branch 'bet2chipin' of https://github.com/rmathew1992/compCharity into bet2chipin
Merge pull request #10 from rmathew1992/bet2chipin

Refactor Database Models
delete previous migrations to start from clean slate
new migrations with chipin models