Merge pull request #2 from smileyface525/styling

Styling
merged to master

Merge branch 'master' into flux