Database Added

Added database code
Removed conflicts