Merge pull request #14 from tihuan/master

Change session[:user_id] to store only user.id instead of whole user obj...
Merge pull request #15 from tihuan/master

CHANGE answers_table_answer_to_integer
Merge pull request #16 from tihuan/master

Add helper.rb to calc average result for each question
Merge pull request #17 from tihuan/master

Add js for add questions dynamically
Merge pull request #18 from tihuan/master

Add remove question function
Merge pull request #19 from tihuan/master

Add more survey info
starting profile
Merge pull request #20 from justinphelps/master

starting profile
added email
Merge pull request #21 from justinphelps/master

added email
updated the view results page
fixed merge conflict
formatting
added to html and worked on fixing survey creation
Merge pull request #22 from tihuan/master

update create_survey
fixed merge conflict with survey controller
answers can now be saved. no further issues evident
Merge pull request #23 from fiddler-crabs-2014/chore/html

Chore/html
Merge pull request #24 from fiddler-crabs-2014/completed_survey_addition

Completed survey addition
Merge pull request #25 from fiddler-crabs-2014/fixing_saving_answers

answers can now be saved. no further issues evident