the work of Boris
Merge remote-tracking branch 'origin/master'

Conflicts:
	Bricks.html