common yml
Merge branch 'master' of https://github.com/thomasalrin/nilavu

Conflicts:
	script/g
deleted the db file
Merge remote-tracking branch 'origin/master'