test commit 2
Merge branch 'master' of https://github.com/jinlong25/catanalysis

Conflicts:
	catanalysis.R