old head
Merge branch 'master' of https://github.com/bellyjeans55/objective_fashion.git

Conflicts:
	objective_fashion/src/GUI/AddItemPanel.java
	objective_fashion/src/GUI/InformationActionPanel.java
	objective_fashion/src/clothing/Outfit.java
	objective_fashion/src/clothing/accessories/Ring.java
	objective_fashion/src/clothing/bottoms/Pants.java
	objective_fashion/src/clothing/singletons/Romper.java
	objective_fashion/src/controller/Mailer.java
	objective_fashion/src/controller/State.java
	objective_fashion/src/controller/TheDecider.java
	objective_fashion/src/externalVariables/Weather.java