test k
Merge branch 'master' of github.com:kkajak/prog

Conflicts:
	dropdb.sh