Merge pull request #21 from lko47/master

Created EnumMap for drugs in inventory
Remove diamond operator in Game
Merge pull request #22 from colatkinson/master

Remove diamond operator in Game
Added method statement regarding police encounters in game class.
Creates Interest Method, prints and format debt amount.
Merge pull request #23 from katiebrennan/Interest_Method

Creates Interest Method, prints and format debt amount.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/main/java/com/tufsd/drugwars/Game.java
Merge pull request #24 from dmares98/master

Added method statement regarding police encounters in game class.
Add Location enum and fix style conventions
Merge pull request #25 from colatkinson/location_enum

Add Location enum and fix style conventions