refactoring to use Java 2D
Merge branch 'master' of https://github.com/BroTeam/TIPE-project.git