adds final style sheet
adds final css and html
fixed final version merge conflicts