Added files on intellij
Solve conflicts
Rename clases
Edit gitignore
Clear dat
Merge branch 'traslateIntellij' into develop
Merge branch 'develop' of https://github.com/cbedoy/CBWAY into develop