Still not working
Merge branch 'master' of https://github.com/QuantumPhi/Starfighter
...
Merge branch 'master' of https://github.com/QuantumPhi/Starfighter