ignore kdeelop files
The merge is necessary because of a flying penis

Merge branch 'master' of github.com:/heartstroke/planesis
fuck you, mate