Страница дискаунта
Merge remote-tracking branch 'origin/master'

Conflicts:
	js/main.js
Merge remote-tracking branch 'origin/master'

Conflicts:
	js/main.js
Merge branch 'master' of https://github.com/meksico/volyaCabinet_ver1

Conflicts:
	stylesheets/style.css