Merge with Lucas's branch.
Completed the function of scaling the images.
Merge branch 'dotto_laptop' into dotto