Merge pull request #12 from ddgebler/master

Add Drug class
add menuGen method
Merge branch 'master' of https://github.com/IIIIIIIIIIIIIIIIIIII/drugwars

Conflicts:
	src/main/java/com/tufsd/drugwars/package.bluej
	src/main/package.bluej
Merge pull request #13 from IIIIIIIIIIIIIIIIIIII/master

Add menuGen method
Fix CONTRIBUTING.md and README.md
Merge pull request #14 from colatkinson/master

Fix CONTRIBUTING.md and README.md