bollocks
merging master to curr branch
created views and adjusted actions to render next
WIP radio buttons
NO CONFLICT WHOOO
the demo presentation
Merge branch 'master' into ting_branch_4
created demo presentaion with .jpg slides. added dependent destroy so that survey_options and survey_feedbacks are destroyed along with a presentation and its slides
Natasha is leaving us.
Renamed files
Merge branch 'natashabranchv5' into ting_branch_4
bug fix
First working version
Merge branch 'ting_branch_4'