Composed media queries should use an 'and' between the existing media query and the 2x media query, for each existing media query.
Merge pull request #5 from michelle/master

Composed media queries should use an 'and' between the existing media query and the 2x queries