commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	StockX Simulator/css.css
	StockX Simulator/index.html
Merge branch 'master' of https://github.com/BattleCry/BattleCry