pulling changes
fix merge conflicts
pull changes
Merge branch 'master' of https://github.com/nixsiow/Burning_Airline_WDI4