Merge branch 'gh-pages'
fix index layout
Merge branch 'master' of github.com:autonome/fxos-workshop into gh-pages
reorder