Readme for website project This is the readme file for the project Updates Adding changes for example Even more changes Changes as part of automatic merge example Updates from Master This is going to be painful, but we will deal with it Causing Trouble Since I plan to edit the same file, this could cause a conflict