changes to css and changed name of html to denette.php
resolved merge conflicts