Added new elements to gitignore
Messing with git
More files
Merge branch 'master' of https://github.com/daniels-mer/kmap

Conflicts:
	kmap/.gitignore