team views
 Merge branch 'master' of https://github.com/alexcazacu/stockfight

Conflicts:
	stockfight/bets/views.py
up
 Merge branch 'master' of https://github.com/alexcazacu/stockfight

Conflicts:
	stockfight/db.sqlite3
open tf
 Merge branch 'master' of https://github.com/alexcazacu/stockfight

Conflicts:
	stockfight/bets/models.py
	stockfight/bets/views.py
	stockfight/db.sqlite3
	stockfight/templates/news_feed.html
ws_news_feed