I hate forgetting to sync
Merge branch 'master' of https://github.com/vgong24/Avionics

Conflicts:
	Avionics/src/Simulation.java