Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
fixed all simpledb stuff
Merge remote-tracking branch 'upstream/master'

Conflicts:
	queue_listener/simple_db.py
Merge pull request #44 from thebrianzeng/master

implemented simpledb