Resolving merge conflicts
Merge branch 'master' into gh-pages
Tweaked circle + text
Design completed with sample content, hooked up to Jekyll data