Done registration
Merge branch 'new_branch'
added database