Merge pull request #1 from 22dfly/initial_project

Initial project
edit conflict
prepare database