updated index...
Merge branch 'markup' of https://github.com/tribuwayuk/gzais into markup

* 'markup' of https://github.com/tribuwayuk/gzais:
  fix conflict