edit gitignore
Merge branch 'master' of github.com:johannhof/NXTplorer

Conflicts:
	.gitignore