get a merge example up and running!
clean up and comment merge example
Changed merge so that you don't have to pass null in for options
merge with conflicts example partly done
merge examples now work!
merge tests!
Merge pull request #286 from nodegit/merge

Merge methods and tests and examples