Merge pull request #1 from thephamiliar613/master

Lab 1b pull
Merge pull request #1 from joshstclair/master

Merge pull request #1 from thephamiliar613/master