css changes
fixed merged conflict
Merge pull request #7 from mike6838/Andrea

Andrea