hopefully resolved conflicts in report.tex
Merge branch 'master' of https://github.com/mbduran/ECSE539-Project-Repository.git