Updated gitignore
Merge branch 'master' of http://github.com/StuyvesantFTC310/testrepo