Initial commit
merge (MERGE_HEAD exists)

Merge branch 'master' of https://github.com/eolembrain-leo/Rtools

Conflicts:
	.gitignore