syncing with kapil
Merge remote-tracking branch 'origin/master'

Conflicts:
	AssessingPie/Query.py
Merge remote-tracking branch 'origin/master'
adding db in