css work
me
Merge pull request #7 from fiery-skippers-2014/gerla

Gerla
fixed conflicts
fixed conflicts