pep8
Merge branch 'master' of https://github.com/hhgabelgaard/E2014.git