fixed some css merge conflicts between branches
Merge pull request #19 from keaty/master

fixed some css merge conflicts between branches