committing to my branch.
Merge branch 'master' of https://github.com/unirad/trial

Conflicts:
	Unirad Trial notes.txt