Merge branch 'debug'
Minor
Merge branch 'master'

Conflicts:
	.Rhistory