fix
Merge branch 'master' of https://github.com/aommiez/drugprice

Conflicts:
	.idea/workspace.xml
	App.php
fxx