Testing conflict
test conflict
resolve conflict commit
Renaming current InstaPollr to InstaPollrTestClient