working update§
Merge branch 'TEST'

Conflicts:
	.bem/levels/blocks.js
	.bem/make.js
	.gitignore