masks
Merge branch 'master' of github.com:yulapps/minsport

Conflicts:
	js/main.js