Allmerged

everything merged and ready to start stitching!