[WarehouseManageSystem] .gitignore
[WarehouseManageSystem] .project
Merge branch 'master' of https://github.com/xingri/WWC_Spartan

Conflicts:
	WarehouseProject/.gitignore
	WarehouseProject/.project