Made presentation changes to HTML and CSS
fix merge conflict: