Merge branch 'master' of https://github.com/clairityproject/trial

Conflicts:
	asdf.com