try to merge
try to fix merge conflict
Merge branch 'master' of https://github.com/cstony0917/curl_lab

Conflicts:
	index.php