Styled everything except question 12 and 13
Merge branch 'master' of https://github.com/katewindy/refactoru-modularity2