typo
Merge branch 'responsive' into steve