Updated postgres settings
Merge branch 'master' of github.com:tajmilur-rahman/LOG6307

Conflicts:
	paper-replication/scripts/git_line_change_origin_blame.py