two lines were changed.
I think this will merge the files
Merge branch 'master' of https://github.com/Alfie-mx/project1