commit
Merge branch 'master' of https://github.com/BattleCry/BattleCry

Conflicts:
	StockX Simulator/css.css
	StockX Simulator/index.html