cleaned up commented code (woops)
Merge branch 'master' of https://github.com/ssaamm/enigma