merging
flights working better than ever
Merge pull request #24 from gina8sis/master

flights working again