Merge pull request #10 from benweddel/master

fixed merge conflicts
Merge pull request #11 from benweddel/master

Updated styling
Merge pull request #12 from benweddel/master

minor changes
contact page
Merge pull request #13 from francinen/master

contact page
expertise file