Merge pull request #2 from thephamiliar613/master

Sync final Lab1
Merge pull request #2 from joshstclair/master

Merge pull request #2 from thephamiliar613/master