Added GUI
Added GUI
Merge origin/master

Conflicts:
	nbproject/build-impl.xml
	nbproject/genfiles.properties
	nbproject/project.properties
	nbproject/project.xml
Merge origin/master

Conflicts:
	nbproject/build-impl.xml
	nbproject/genfiles.properties
	nbproject/project.properties
	nbproject/project.xml
Merge origin/master
Merge origin/master
Make a test xml
Make a test xml
Finished buildXml
Finished buildXml
Ashlie finished buildXML