Add stocks to warehouse (not working 100% correctly)
last one again
Merge remote-tracking branch 'origin/master'

Conflicts:
	application.properties