conex
Merge branch 'master' of https://github.com/Kahosk/awesome-stock-page

Conflicts:
	php/conex.php