Added a section in the readme to do with conflicts by not having the most recent version of the project and then pushing changes
Added a section in the readme to do with conflicts by not having the most recent version of the project and then pushing changes

Chuddington/COMP329AssignmentOne