merge
Merge branch 'master' of https://github.com/darren-trx/testing

Conflicts:
	README.md