what the heck
fixed merge conflicts
Merge pull request #21 from hkxnyc/tester

Tester