git
Merge branch 'master' of https://github.com/SinanShi/R

Conflicts:
	update.git
git