Updated report
Conflit solved
Merge branch 'master' of https://github.com/alanwink13/ecs145final