Spaceship now follow trajectory
Merge remote-tracking branch 'origin/master'

Conflicts:
	Source/controller.cpp
	Source/shuttle.cpp
	Source/shuttle.h