base styling
fixed merge conflicts
Merge pull request #13 from fiery-skippers-2014/styling_round1

Styling round1