work on javascript file and survey new.erb to implement question/answer type functionality
move question/answer type code out of 'add your question' function
working on adding the correct answer format when 'add another choice' is clicked
Merge branch 'master' into ishwar
Making changes to application.js on top of Steve's changes
make case statement to append choice when 'add another choice' is clicked
have values in text fields persist across changes of question type
Merge branch 'master' of https://github.com/in15/beautipoll

Merging branch 'ishwar' with 'master' and pulling all other changes. Work done on 'ishwar' was functionality to have multiple question types, and for text field values to persist across question type changes, as dictated by user.