xml stuffs
Merge branch 'master' of https://github.com/lumpyrocks/Roobotics_FRC_I

Conflicts:
	nbproject/private/private.xml