moving changelog to its own file
Add Conflict Resolution section, move Changelog
Merge pull request #22 from TurnerBroadcasting/feature/update-conflict-resolution

Feature/update conflict resolution