initial commit
Merge https://github.com/aaronschraner/Waldo