Added merge-script.sh to the gitignore.
Updating some stuff
Merge branch 'master' of https://github.com/hgfjh/Ultimate-Ascent
Merge pull request #24 from pavanh91/master

LeftY now controls the angle of the shooter
Completed the Smart Dashboard Class
Merge pull request #25 from aravindkoneru/master

Completed the Smart Dashboard Class
Merge remote-tracking branch 'olu/master'

Conflicts:
	src/org/usfirst/frc1923/events/ShooterStopEvent.java
Merge branch 'master' of https://github.com/aaronweiss74/Ultimate-Ascent
Fixed @keshavbob's mistake with building.
Fixed @pavanh11's mistakes.
Merge remote-tracking branch 'aaronweiss74/master'