Merge origin/master

Conflicts:
	src/TestClass.java
Fixed readXML
Fixed readXML
Fixed readXML
Fixed readXML
Merge origin/master

Conflicts:
	src/TestClass.java
Working on adding ingredients
Working on adding ingredients
Merge origin/master
Merged with new GUI
Merged with new GUI
Merged with new GUI
Completed merge