I don't know if this worked
new change
Merge branch 'master' of https://github.com/RosalieP/Coop_Website

Conflicts:
	trial.html