edits
Merge branch 'master' of github.com:Levifer/REDO-FLEET-EAR