Lab 1 Milestone
Merge branch 'master' of https://github.com/mb4828/cosc460