new homework
fixing kevins git problems
merge conflict