...
Merge branch 'master' of github.com:Metalmastery/Solo-kharkov-ua

Conflicts:
	js/main.js