Merge branch 'master' of https://github.com/jtipton25/Multi-species-model

Conflicts:
	simMsJT.R
update

Merge branch 'master' of https://github.com/jtipton25/Multi-species-model

Conflicts:
	simMsJT.R