changing gitignore
Merge branch 'master' of https://github.com/hcbl1212/frc
changes here
fixed merge confilcts