Fix conflict.
Merge branch 'master' of https://github.com/not001praween001/socio_quiz

Conflicts:
	Gemfile.lock