fixed stock and finished port
Merge branch 'master' of github.com:gyg2104/Python_Group_Project

Conflicts:
	stock.py