added about us page
Merge branch 'master' of https://github.com/rmathew1992/compCharity into pages

Conflicts:
	goodbets/templates/base.html
	goodbets/urls.py
Merge branch 'master' of https://github.com/rmathew1992/compCharity into pages
add simple feed template
delete previous migrations to start from clean slate
new migrations with chipin models
Merge pull request #11 from rmathew1992/debug-master

Debug master
Need to keep track of db.sqlite3 for heroku
Merge branch 'master' of https://github.com/rmathew1992/compCharity into pages

Conflicts:
	db.sqlite3
feed jumbotrons display info about all challenge model fields
Merge pull request #12 from rmathew1992/pages

Sprint 3 Updates to the Feed
adding database
Merge master