included logging method

Conflicts:
	.gitignore