Adds some styling
merges with tommy's version
fixes conflicts
Merge pull request #2 from slkennedy/sara_branch

Sara branch