PEP8 changes and added media folder again
Merge pull request #6 from Frostlock/master

PEP 8 improvements