more styles
gerge branch 'master' of https://github.com/tiy-durham-june2014-frontend/team-orange

This is a merge commit.