Merge branch 'master' of https://github.com/FRCTeam1719/2013Java

Unfinished commit; working on autonomous and shooting code