ignore
Merge branch 'grafikus' of https://github.com/LNagyFAttilaC/nabukodonozor into grafikus

Conflicts:
	.gitignore
Merge branch 'grafikus' of https://github.com/LNagyFAttilaC/nabukodonozor into grafikus

Conflicts:
	.gitignore