Merge pull request #1 from thephamiliar613/master

Finalized Lab1