css is done.
Merge pull request #28 from jvh1979theironyard/master

css is done.
resolve merge conflict