ignore r history
.gitignore
Merge branch 'master' of https://github.com/aloy/lmeresampler

Conflicts:
	.gitignore