fix merge
Merge branch 'master' of github.com:pmills88/Project-2
Merge branch 'master' of github.com:pmills88/Project-2
Merge branch 'master' of github.com:pmills88/Project-2
Merge branch 'master' of github.com:pmills88/Project-2
Merge branch 'master' of github.com:pmills88/Project-2
Merge branch 'master' of github.com:pmills88/Project-2
add background colors
Merge pull request #38 from sneubig/addStyles3

Add styles3