added modal
Merge pull request #4 from laurenbenichou/modals

added modal
Start ajax stuff
Merge branch 'master' of github.com:negomi/psychoviz
Update quiz controller
modal functionality
Resolve merge conflicts