lol
Merge branch 'master' of https://github.com/AnisB/FreeBird

Conflicts:
	data/cockpit/cockpit.mtl
Merge branch 'master' of https://github.com/AnisB/FreeBird
Tex problem