First commit
Merge branch 'lock_screen' of https://github.com/koundeld/ishu.git