Lab6 fix order of 'shapes' and 'scales' iteration

Hi,
The first commit is really what matters. If length(shapes)==length(scales) everything is fine, but the order of 'shapes' and 'scales' should match to avoid confusion.
Feel free not to merge the new indentation, although I think it is useful.
Thanks.