Merge pull request #1 from FRC116/master

Gimme dat pull
Merge pull request #1 from watermelonduck/master

Giving attar all my work
Merge pull request #2 from cartycrabber/master

Merge pull request #1 from FRC116/master
Merge remote-tracking branch 'upstream/master'