fixed merge error
fixed a few flaws and login and logout works fine.
Merge pull request #5 from lrakhman/survey_controller

Survey controller
Merge branch 'master' into survey_page
rsolved merge error
Merge pull request #6 from lrakhman/layout

Layout
errors fixed
new css pages, new layout pages
adding surveys from js to ruby works, need to move the title over to surveys object
login/create/logout works
Merge branch 'master' into layout
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