Merge branch 'master' of https://github.com/tcafxc/Trial

Conflicts:
	README
Solving merge conflict