Fixed readXML
Fixed readXML
Fixed readXML
Fixed readXML
Working on adding ingredients
Working on adding ingredients
Merge origin/master
More GUI
Merge origin/master

Conflicts:
	src/TestClass.java
Merge origin/master

Conflicts:
	src/TestClass.java
Merged with new GUI
More GUI
Merged with new GUI
Merged with new GUI
Completed merge
Merge origin/master
Merge origin/master
Merge origin/master

Conflicts:
	src/TestClass.java