Adding styles.css back into dev
Merge branch 'master' into dev
Merging to master