updates to diff
Merge branch 'Test02182014' of https://github.com/digibyte/DigiByteProject into Test02182014