Test
Merge branch 'master' of https://github.com/mikh/Quadcopter-Simulation

Conflicts:
	AlgorithmTest/src/Pilot.java

test commit