Merge branch 'master' of https://github.com/Fry-IT/enidlinder.app
pep8