latest update
Merge branch 'master' of https://github.com/stlim0730/mcq

Conflicts:
	mcq_server/sample_db_script.js