null pointer exception fix
Merge branch 'master' of https://github.com/bobsbeard1/puzzles.git