add home computer files
resolve merge conflicts and fetch latest tests