.gitignore .ds_store
Merge branch 'master' into test
Adding :focus psuedo class styles, as is with :hover
Merge branch 'refs/heads/master' into test

Conflicts:
	themes/diversity/css/global.styles.css
Merge branch 'refs/heads/master' into test