initial files, test case and implementation for first conflict resolution algorithm
fixed typo in method, changed method to behave more ruby-esque-ly, and added argument validation tests
tons of work to conflict resolution, scheduler, basically everything
added sample csv file for running the dvr as a service