renaming again for IDE compatibility
Merge branch 'master' of github.com:DaKnOb/Doorlock