git-demo hey i added this (i also added this too) Hey my name is Boris <<<<<<< HEAD My roommate's dogs' names are Wyatt and Clementine greg's addition My friend's name is cat yeah! 5f50bcc3ad4ec85a6588b7f7f43e5a199fa2c044