change
Merge branch 'master' of github.com:madcato/x-wing-maneuvers

Conflicts:
	src/x-wing-manouvers.c