Merge branch 'master' of https://github.com/AndrewAdam/Test

Conflicts:
	README.md
Merge commit 'de6ea62f44062267d2dfe43654917b52ac4d3d11'

Conflicts:
	README.md
test