sale GUI really working
Merge branch 'master' into Shane

Conflicts:
	stocks.ser
fixed