finished styles
merging changes from gh-pages
made a small style change