It keeps making me commit
Merge branch 'EDS' of https://github.com/joseph-devito/Polaris into EDS

Conflicts:
	css/polaris-styles.css