Pretty table
Merge branch 'master' of https://github.com/nsn-wroclaw/innovativeproject-dbshepherd

Conflicts:
	conf.yaml
	shell.py