Changed the mask file, added masking
Merge branch 'master' of github.com:maksimov/magic

Conflicts:
	app/assets/images/mask.png