forget this
Merge branch 'master' of https://github.com/JanLecko/EquiMarket2.0

Conflicts:
	Scripts/maps.js