initial commit for project four
fixing merge conflict