Finished Lab7
Merge branch 'Leon'