added styles.scss
fixed merge conflict
Merge pull request #22 from ansleyjones/master

added styles.scss