edited alignment, discarded edits
Merge branch 'master' of https://github.com/nc12/pyladies