changed style
Merge branch 'master' into styling
styling changes
Merge pull request #25 from nairys/styling

Styling update