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
profile gets stuff
adding db.sqlite to the gitignore
trying to get app.js info
Merge branch 'nitya-fix' of https://github.com/rmathew1992/compCharity into nitya-fix

Conflicts:
	db.sqlite3
	goodbets/templates/profile.html