Merged the 2 conftest files
Merge pull request #53 from AndreiH/merge-conftest

Merged the 2 conftest files