merge problems
Merge pull request #41 from belindahare/master

merging styles