Updated ignore rule
Merge branch 'master' of github.com:theuros/sass

Conflicts:
	css/styles.css
minor update