Found many conflicts
Merge branch 'master' of github.com:Bryan792/cpe448-lab6