satisfy linter
refactoring

- moved counter i and j into for each loop
- switched to using .format instead of + for concatination
fixed conflict
forgot one merge conflict
further refactoring

- fixed one missed + as concat usage
- using itertools.count instead of range
  this maked the code shorter and easyer to read
switched to enumerate
Merge pull request #3 from Velrok/master

nice string concat + moved i, j counter into for loop