updating total
Merge branch 'jreese42_dev' into brhiln

Conflicts:
	stockgui.py
lsdkjf
Merge branch 'jreese42_dev' into brhiln
ofj;s
Merge branch 'jreese42_dev' into brhiln
oifheauzfd
trying to add favicon
loading simulated data, Making game playable
Load simulated data now resets every time
update css and html formatting