modified 'pages/index'
changed db/schema.rb
Solve conflict
added widgets to page