Test
Merge https://github.com/jaypmorgan/Ador

Conflicts:
	test.txt
Merge https://github.com/jaypmorgan/Ador
Test