added stylesheet, changed header
resolve merge conflict
changes to index