initial commit
Merge branch 'master' of https://github.com/roman-i/infog

Conflicts:
	.gitignore