a
Merge
Merge pull request #13 from WhaleMonster/anna-wu

Added routes to take the survey and record the responses
added css
Added seed file
merge
Merge
merge conflict
Merge conflict
I hate merge conflicts
Merge pull request #15 from WhaleMonster/seed

Seed
Merge Conflict
Merge branch 'master' of https://github.com/WhaleMonster/Shake-n-Bake
more css
fixed merge conflicts
Add some ajax fun to the javascript. Allows for delete.
Added other changes. Includes views, Ajax - Add for delete, and updated the edit.erb page.
Merge pull request #18 from WhaleMonster/lance_tipton

Lance tipton
Added Ajax to the survey and question delete.
Merge pull request #19 from WhaleMonster/lance_tipton

Added Ajax to the survey and question delete.