t
Merge branch 'master' of https://github.com/nicholac/elitetrader

Conflicts:
	trader/views.py
yy