adding profile page and adjusting the layout
merging and resolving conflicts in db/schema.rb