fixed plane state conflict
Merge branch 'master' of https://github.com/jdesai927/CIS700-Airplanes