making debugging a flag
Merge pull request #6 from joshualande/betteralgorithm

making debugging a flag
resolving conflicts