Merge pull request #26 from Nukic/master

CST-559
move styles from .css to .scss (CST-559)
try to fix conflict in styles.css
Merge pull request #27 from justmarkup/master

move styles from .css to .scss (CST-559)
CST-614