NEW price margin
Merge branch 'master' of https://github.com/Air-Mark/air-t-mark.github.io

Conflicts:
	manager/manager.exe