add trace
Merge remote-tracking branch 'origin/master'

Conflicts:
	Trace/file/nasaTrace.md