fix conflict
responsive
= =?
ditto
ditto
ditto
ditto
= =...
Merge branch 'gh-pages'

Conflicts:
	index.html