added basic merging function
updated remote section
Merge branch 'master' of https://github.com/littledannyha/testRepo