created database table for pages
first page in db
populated database
merge conflict in app.rb resolved