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