gitignore added
Merge branch 'master' of https://github.com/mekuriam/adisaba

Conflicts:
	.gitignore