Merge branch 'master' into production
Merge branch 'production'
Merge pull request #97 from not001praween001/master

Adjust a little at login page.
Merge branch 'master' of https://github.com/SocioQuiz/socio_quiz
Update Elevator pitch
Merge pull request #99 from z13052hn/my_branch

Update Elevator pitch
modify quiz types in form.
Merge pull request #100 from yuchan/modify-quiz-type-form

modify quiz types in form.