updated site
Merge branch 'master' of https://github.com/jamesobi/mysite   after adding edited mysite and css