ay
ay
Merge branch 'gh-pages' of https://github.com/ricardomayerb/qmacroexamples into gh-pages
go
Merge branch 'gh-pages' of https://github.com/ricardomayerb/qmacroexamples into gh-pages
Merge branch 'gh-pages' of https://github.com/ricardomayerb/qmacroexamples into gh-pages
update index
u

Merge branch 'gh-pages' of https://github.com/ricardomayerb/qmacroexamples into gh-pages

Conflicts:
	index.html
fix
grt

Merge branch 'gh-pages' of https://github.com/ricardomayerb/qmacroexamples into gh-pages

Conflicts:
	index.html