logging
Merge branch 'master' of github.com:daveagp/java_visualize

Conflicts:
	java_safe_ram_maketrace.php