mass commit
Merge branch 'master' of github.com:bukzor/scratch

Conflicts:
	.gitignore