Push from the last two edit sessions
Properly adding user friendly files
Merge branch 'master' of https://github.com/frc3946/UltimateAscent

Conflicts:
	src/org/usfirst/frc3946/UltimateAscent/XboxController.java

//dipshit error forcing extra commits
//syncing w/ repo