Commit
Merge branch 'master' of https://github.com/rommager/zoologics.git
Vaccine and VaccinePanel mostly complete, compilation error that I need
assistance with.
Merge branch 'master' of https://github.com/rommager/zoologics.git

Conflicts:
	ZooLogics/src/edu/radford/itec370/mainmethod/zoologics/Vaccine.java
	ZooLogics/src/edu/radford/itec370/mainmethod/zoologics/gui/AdminPanel.java

	Resolved conflicts, merged and corrected resulting errors.
VaccinePanel and Vaccine mostly done, need assistance to complete.