resolving conflicts
Merge branch 'master' of github.com:otondin/AirWar