Didn't finish but handed in
fixed merge conflict in .gitignore