joan 18:55
commit joan
joan 18:19
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/R.txt