Delete local_settings.py
Delete mongod.lock
Delete c_local.ns
Delete ChikkaAPI.py
Delete local.ns
Delete c_local.0
Delete local.0
Merge remote-tracking branch 'origin/master'

Conflicts:
	local_settings.py