added logging via log4j2
switching branches
feature_logging branch
feature_logging branch
Merge branch 'feature_logging'

Conflicts:
	.idea/workspace.xml