Clean up merge conflicts
Merge branch 'master' of github.com:Integralist/Style-Guides