Add my solution to the HTML/CSS exercise
merge