Minor changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	css/_mixins.scss
	css/index.css
	css/index.scss