Added website
Merge remote-tracking branch 'upstream/master'
Tweaked some content, added Jonathan website
text tweaks
Merge pull request #245 from jfarbowitz/master

Text tweaks on about page