test merge external diff tools 1
Merge branch 'master' of https://github.com/apo-j/PageGenerator

Conflicts:
	Index.html
Merge branch 'master' of https://github.com/apo-j/PageGenerator

Conflicts:
	Index.html
Merge branch 'master' of https://github.com/apo-j/PageGenerator

Conflicts:
	Index.html