Merge branch 'master' into test_branch_1

Conflicts:
	Rcode/chiSquared.R