Netbeans stupidity
Merge branch 'master' of https://github.com/SunnyBat/FrcAerialAssist

Conflicts:
	2014RobotCode/nbproject/private/private.xml
Added the start of the Auto Aim feature

Added The network Tables ( the fancy way as Royce tells me)