user lcoation
Merge branch 'master' of https://github.com/in-programmer-in/p1