ok, wrapping up install process and setting up git@github.com:julierich1211/Group-Project2.git
Initial commit
Merge branch 'master' of github.com:julierich1211/Group-Project2
ok, wrapping up install process and setting up git@github.com:julierich1211/group-project2.git
ok, wrapping up install process and setting up git@github.com:julierich1211/KenPhilJulie.git
fixing merge conflict