Test how merging works
Merge branch 'master' of https://github.com/mayonezo/trace_matlab

Conflicts:
	tracing.m

Merge test 1
Commentaries added