Commit to fix merge conflict.
Fixing files before pull.
Merge branch 'master' of github.com:ayrtonmassey/OOP-Project