premerge
merge conflicts
Merge pull request #123 from fiery-skippers-2014/styling_and_ux_design

Styling and ux design