db

Added db, fixed stuff.
Merge remote-tracking branch 'origin/retina'
Added login