Merge branch 'dev1'
random question controller
random question controller 2
adding of cities