ADDED ADDRESSES
ADDED ADDRESSES
Merge origin/master

Conflicts:
	bestTwoYears/src/besttwoyears/control/Constants.java
	bestTwoYears/src/besttwoyears/control/GameControl.java
	bestTwoYears/src/besttwoyears/model/Person.java
got bag display to work