Added styling and content to /about
Added stuff to about page and fixed merge conflict