Renamed SoftEngIssues to project man
Merged confilts in report.tex