ignore generated files
Merge branch 'master' of git@github.com:erlocator/erlocator.git

Conflicts:
	.gitignore