afegits classes
Merge branch 'master' of http://github.com/prop2014/java