Merge branch 'xcarriage'

Conflicts:
	box_frame/configuration.scad.dist
Update note about i_am_box
Merge pull request #48 from AxTheB/master

Git usage fail last time