adding to heroku
added profile page layout divs
added profile page divs and fixed merge conflict