completed object conversion
Merge branch 'master' of https://github.com/CodingChipmunks/DBSecondAssignment

updated ui and obj. conv
Merge branch 'master' of https://github.com/CodingChipmunks/DBSecondAssignment

dunno