940 CSS

Signed-off-by: Ivan <ivan.antipov@ostmodern.co.uk>
Merge branch 'master' of github.com:jrodwell/ballball

Signed-off-by: Ivan <ivan.antipov@ostmodern.co.uk>

Conflicts:
	wp-content/themes/ballball/library/css/ie.css
	wp-content/themes/ballball/library/css/style.css
	wp-content/themes/ballball/library/scss/_base.scss