Merge pull request #1 from lrakhman/layout

Layout
Merge pull request #2 from lrakhman/layout

layout works
Oohhh fancy fade away on submit question and choice, set up architecture to put choices and questions into arrays
Merge pull request #3 from lrakhman/layout

working css shit
survey page is functioning. created part of index page
nothing
Merge pull request #4 from lrakhman/survey_page

Survey page
fixed a few flaws and login and logout works fine.
form being built and sent back to controller as json
resolved conficts
Merge pull request #5 from lrakhman/survey_controller

Survey controller
rsolved merge error