merging two repos into master and pushing to github.