Merge pull request #319 from treeowl/generalMerge2
authorDavid Feuer <David.Feuer@gmail.com>
Thu, 25 Aug 2016 20:13:02 +0000 (16:13 -0400)
committerGitHub <noreply@github.com>
Thu, 25 Aug 2016 20:13:02 +0000 (16:13 -0400)
Add general merge functions for maps


Trivial merge