Merge remote-tracking branch 'origin/master'

diff --cc js/quiz.animations.js
Simple merge

diff --cc js/quiz.screens.js
Simple merge

diff --cc views/index.blade.php
Simple merge

diff --cc views/screens/question_country.blade.php
Simple merge

diff --cc views/screens/question_draganddrop.blade.php
Simple merge

diff --cc views/screens/question_email.blade.php
Simple merge

diff --cc views/screens/question_text.blade.php
Simple merge

diff --cc views/screens/question_textarea.blade.php
Simple merge