collision and speed reduction
Merge branch 'master' of github.com:Otzeloot/flight

* 'master' of github.com:Otzeloot/flight:
  collision and speed reduction

Conflicts:
	flightSimulator/MyScene.m