Merged test-branch1 to master

Changes:
styles.css is now styles.css.scss to work with sass