began styling home page
fixed merge conflicts
Merge pull request #1 from inoda/style

began styling home page