second commit
Merge branch 'master' of https://github.com/quarckster/tracing

Conflicts:
	index.php