fixed merge error
Merge branch 'master' into survey_page
errors fixed
adding surveys from js to ruby works, need to move the title over to surveys object
Merge pull request #7 from lrakhman/layout

Layout
started profile page.
Merge branch 'master' into survey_page
Merge pull request #8 from lrakhman/survey_page

Survey page
finished up the title bizness, oh so sexy typewriter stylin'
conflicts resolved
Merge pull request #9 from lrakhman/survey_controller

Survey controller
not sure
Merge branch 'master' into layout
header is changed.