Test
Try to Resolve confilcts
text completed
Delete .classpath to avoid merge conflicts
before delete
Still uncommitted changes...
Merge pull request #27 from DustInMonteriggioni/LC

Lc