fix merge conflicts
[3501/2015-FRC-Spark] / .gitignore
2015-11-20 Davidfix merge conflicts position-aware-autonomous
2015-11-17 Kevin ZhangChange the gitignore
2015-11-17 daniel watsonremove .classpath and .project before sharing
2015-11-15 Kevin Zhangremove bin from tracking; add gitignore
2015-11-15 Kevin ZhangAdded gitignore file