Strategy Pattern---
Merge branch 'master' of https://github.com/our-Info3/assignment_3

Conflicts:
	GildedRoseWithTest/src/main/java/gildedrose/inheritance/AgedBrie.java
	GildedRoseWithTest/src/main/java/gildedrose/inheritance/GildedRose.java
	GildedRoseWithTest/target/classes/META-INF/maven/GildedRoseJava/GildedRoseAssignment3MVN/pom.properties