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

Conflicts:
	stockfight/db.sqlite3
	stockfight/team_fight/urls.py