Correction in xml classpaths
Committing for xml resolution to master
Merge branch 'master' of https://github.com/frc3946/UltimateAscent

Conflicts:
	nbproject/project.xml

// Conflict resolution being weird inside vs. outside NetBeans