pushhhhhhhh
add QDrug
Merge remote-tracking branch 'origin/master'

Conflicts:
	index.php
	page/pull/show2_dru.php
add QDrug