fix bug in jar manifest generation
Merge branch 'master' into BenBranch
Merge branch 'master' into BenBranch
fix gitignore
update frc emulator