work on CI module
conflict db/schema.rb deleted
Add db/schema.rb merged