Vendor :: addNewMedicine()

Merge origin/master

Conflicts:
	softra/src/softra/bakchodi.java
Merge origin/master

Conflicts:
	Shop/src/Shop/Vendor.java