Adding some basics
Merge branch 'master' of github.com:rdhaliwal/working-with-styleguides
Renaming stuff