Receive Logic

Added logic to the receive data function.  It handles conflicts very
basically by removing any action from the user's undo/redo log that has
a conflict with the new action.  Nothing has been tested as I currently
cannot build on my device.