.
Merge branch 'master' of https://github.com/benflips/gtq

Conflicts:
	ABC/Quoll_functions_outbreeding_other.R