Some random insignificant stuff changed
Merge branch 'master' of https://github.com/SunnyBat/FrcAerialAssist

Conflicts:
	.gitignore
gitignore