Merge pull request #7 from masidonion/joe_sim

reconcile
WIP displays first question and basic jquery
Merge pull request #8 from masidonion/jake_judy/take_survey

WIP displays first question and basic jquery
create survey
Fixed merge conflicts