init
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
db work skeleton
db reworked
test
list
templates
db dump added
basic method implemented
Merge remote-tracking branch 'origin/develop'

Conflicts:
	.gitignore
Merge remote-tracking branch 'origin/master'
basic method implemented