add CSS
fixed conflicts
Merge pull request #16 from fiery-skippers-2014/dev

add CSS