Ignore this commit
Merge branch 'master' of https://github.com/dfilipp1/SoftwareEngineering2Project