config
Merge branch 'gh-pages'

Conflicts:
	config.codekit
Media queries
Merge pull request #1 from 55sketch/master

Master