Merging
Merge branch 'master' of github.com:xram-co/lego

Conflicts:
	src/brick.h