Git complaining about report merge, fix by commit
Merge branch 'develop' of github.com:macewanCMPT395/Team2 into develop