Merge pull request #11 from davidguerette/style

Style
Merge branch 'style'
Removed welcome layout.
Cleaned up temp assets.
Resolved merge conflicts.