Added main.css and modified main.html for project
fixed merge conflict