This repository was archived by the owner on Sep 18, 2018. It is now read-only.
Adding git merge
Merge pull request #25 from selenamarie/add-git-merge Adding git merge to fix issues with a local master checkout
Merge pull request #25 from selenamarie/add-git-merge Adding git merge to fix issues with a local master checkout