commiting
Merge branch 'master' of https://github.com/fcpteam1/project

Conflicts:
	orders.ser
	sales.ser
	stocks.ser