Merge branch 'master' into gh-pages
style tile

..
Merge branch 'gh-pages'
changed to index

changed style-tile to index