Added method statement regarding police encounters in game class.
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.