Fix Name Display
"Merging"

Merge branch 'master' into nathan
Add CSS
Merge pull request #10 from n-zeplo/nathan

Nathan