Added stock loading to Loader class. Took city loader in to use in testdisplay.py, now the city is loaded from city.txt.