Added gitignore again
Merge branch 'master' of https://github.com/Nashoba-Robotics/Nashoba-Robotics2014

Conflicts:
	.gitignore
	BSD_License_for_WPILib_code.txt