Fixed issues with "Stock" output
Merge remote-tracking branch 'origin/master'

Conflicts:
	Stock.java