Fix some files with unresolved merge conflicts
Optimize imports
Replace some System.out for calls to log4j
Add a semantic versioning note to README file
Merge pull request #11 from jmrozanec/master

Fix some files with unresolved merge conflicts