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

Conflicts:
	stockfight/bets/views.py
	stockfight/static/js/user_bets.js
	stockfight/stockfight/urls.py