Merge https://github.com/not001praween001/socio_quiz into not001praween001-master-submaster
Update .travis.yml
Merge branch 'not001praween001-master-submaster'
Delete "bundle install" of travis
add apicontroller.
add doorkeeper
update Gemfile.lock
update authcheck
Merge pull request #25 from yuchan/yo-add-api-controller

add api controller
Merge branch 'master' of github.com:SocioQuiz/socio_quiz

Conflicts:
	Gemfile.lock
add play model.
fix migration error and regenearte play model.
Merge pull request #29 from yuchan/yo-store-data-of-play-quiz

add play model
judging users_s answer is correct.
Merge pull request #30 from harakoji/master

judging users_s answer is correct.
resolve conflicts
Merge branch 'not001praween001-master'
Merge & Fix confix
Merge pull request #2 from SocioQuiz/master

Merge pull request #12 from not001praween001/master