Merging Two Projects Into One Git Repository