before pulling
Merge branch 'master' of https://github.com/locdang/CS174_hw5

Conflicts:
	config/create_sql_test.php