Changed Drug superclass
Serialized Drug

Sterilized Drug class so main activity can pass to second activity.
Optimized Drug constructor
back on track

updated constructors for the remaining drug subclasses, added setters
and getters to drug.
merge with master

sync and merge attempt
Merge branch 'kelvin-branch'

Conflicts:
	.idea/workspace.xml