Cleaned up my merge, and  startup crash fix attempt
Merge branch 'master' of https://github.com/FRCTeam1073-TheForceTeam/robot13