/lab3

Eugene Ho 
Lab3
This might cause a merge conflict
Partner: Cody Mattern