adding pseudo database
Merge remote-tracking branch 'origin/master'

merging katie's fix