test for pjank
Merge branch 'master' of https://github.com/TheAirlineProject/desktop