Back to max conflicts
Merge pull request #8 from jaypoulz/jpTwiddleThumbs

Back to max conflicts