adding lockers
Merge branch 'feature/user-lockers'