added containers and some content to home page
resolving conflicts