Checking if null and QOL changes

Nothing much
Merge branch 'master' of https://github.com/Gnewt/bainbridgefirst

Conflicts:
	.gitignore
	SpartronicsBot/src/edu/wpi/first/wpilibj/templates/RobotTemplate.java
updated the git ignore
Merge branch 'master' of https://github.com/Gnewt/bainbridgefirst