Merge pull request #3 from websuperheroes/master

Merge basic styles into master
Merge branch 'basic-styles'