Edit .gitignore
Merge branch 'master' of github.com:FIRST-4030/2014
Partial update (not stable, just pushing to sync with computer)