Syncing xmls
Merge branch 'master' of https://github.com/frc3946/UltimateAscent

Conflicts:
	nbproject/project.bak.xml
	nbproject/project.xml
--syncing
Committing AutoAim and Kentucky Windage revisions from the day's work.