Merge branch 'master' of github.com:crazymykl/shades

Conflicts:
	.gitignore