Add UI class; create splashscreen method
Add Player class
Merge pull request #7 from llamapudding/master

Add Player class
fix merge conflict
fix merge conflict
Merge branch 'dkim561-master'
Remove all BlueJ config files
Merge pull request #8 from colatkinson/no_bluej

Remove all BlueJ config files
Add menu screen and javadoc to UI
Merge pull request #9 from IIIIIIIIIIIIIIIIIIII/master

Add menu screen and javadoc to UI
Remove BlueJ cruft (again)
Merge pull request #10 from colatkinson/remove_bluej_again

Remove BlueJ cruft (again)
Fix package name from BlueJ change
Merge pull request #11 from colatkinson/package_name

Fix package name from BlueJ change
Luke I am your father
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