Adds general drug class
Merge pull request #4 from katiebrennan/master

Adds general drug class
Fixes indentation issues in drug class. Adds media folder.
Switch project to Java
Merge pull request #5 from shhs-coding-club/java_setup

Switch project to Java
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