create survey
Fixed merge conflicts
Merge pull request #9 from masidonion/joe_sim

Joe sim