Merge branch 'master' of /Users/zwg2/Desktop/bootcamp/git/przm-air with conflicts.
re-did flight id builder in flight id 2 with corrections from friday's code review including changing ifs to a do while loop etc.

https://app.asana.com/0/19128794071925/19594215856460