Atack and defense methods overrode.
merge conflicts resolved
Merge branch 'fanky'
bug-fix airplane now is mortal
new requirements for version 0.2
battlefield rename + test
new battle algorithm (:
Merge branch 'master' of https://github.com/fanky10/simple-java-training
bug-fix, if an unit is dead it cannot attack.. like a zombie
first version (unstable) of web
stable version of web version