Merge pull request #2 from thephamiliar613/master

Sync final Lab1