minor change
Merge branch 'master' of https://github.com/Wooodstock/drugstore

Conflicts:
	resum_para.php