updated style sheets and changed to css.scss
Merge pull request #4 from edsant1/edwin/iteration4

updated style sheets and changed to css.scss