edit styles
Merge branch 'feature_pete' into dev-master

Conflicts:
	assets/css/styles.css
	assets/scss/_rtstyles.scss
	index.html