Lab-Four Lab 4, Version Control Emily Carpenter more edits This may cause a merge conflict. Partner: Guanbo Bian