Merge white and black octocats into family3.
Merge white and black octocat into family3. This completes issue #3.