somechange
Merge branch 'master' of github.com:longfei-wang/sneakytrade

Conflicts:
	main/forms.py