Initial set up of the public website
merge conflict