ignore .rproj files
history
Fix local updates - push it again soon

Merge branch 'master' of https://github.com/LinMod/Domain-Recall

Conflicts:
	.Rproj.user/FD066F25/sdb/prop/INDEX
	.Rproj.user/FD066F25/sdb/s-8A81B434/E952E759
	.gitignore
Delete commit message - repush
Merge pull request #3 from LinMod/master

Remerge Master and Temp