Merging all non-conflict files
Updated gitingore
Added contracts table and some fields.
Log DELETE statements.
Merging the critical files.