Add question image showing
Merge branch 'showing-image' into development
Resolve conflicts
Question now changes after 30 seconds.
Merge branch 'development'