commit
comit
Merge branch 'master' of https://github.com/sonnv/project03

Conflicts:
	var/locks/index_process_1.lock
	var/locks/index_process_2.lock
	var/locks/index_process_3.lock
	var/locks/index_process_4.lock
	var/locks/index_process_5.lock
	var/locks/index_process_6.lock
	var/locks/index_process_7.lock
	var/locks/index_process_8.lock
	var/locks/index_process_9.lock