gitignore
Merge branch 'master' of https://github.com/kovacsja/dia2html
Merge branch 'fileba_iras'

Conflicts:
	.gitignore
	dia2html.py
Merge branch 'master' of https://github.com/kovacsja/dia2html
add gitignore