Update main.cpp
Merge branch 'master' of https://github.com/ngovind2/CS1037

Conflicts:
	Assignment-1/Stock/main.cpp