Added conflictHandler test.
Added 'resolve' conflict handler that (as of now) adds your new argument
Fixed removal bug. Array.remove should be Array.splice
Added conflictHandler feature.
Updated README
Merge pull request #43 from applepicke/master

Conflict Handler