Added merge-script.sh to the gitignore.
Updating some stuff
Merge branch 'master' of https://github.com/hgfjh/Ultimate-Ascent
Merge remote-tracking branch 'olu/master'

Conflicts:
	src/org/usfirst/frc1923/events/ShooterStopEvent.java
Merge branch 'master' of https://github.com/aaronweiss74/Ultimate-Ascent