broke out merge logic and added UnitTests#9

Open

drake1011 wants to merge 5 commits intojpabeem:masterfrom drake1011:master

+312-73

Commits on Oct 13, 2018

Commits on Oct 19, 2018

updated exception to be more specific
drake1011
committed

Commits on Oct 28, 2018

removed unnecessary catch and throw
drake1011
committed