updated README.md and tests

Added custom logging level test
fixed conflicts

Conflicts:
	README.md