Added stuff. It's different from before.
I hate this file the most with the fiery burning passion of 50,000,000,000 Galactic Systems
Merge branch 'master' of https://github.com/frc3946/AerialAssist

Conflicts:
	AerialAssist/nbproject/private/private.xml