location updating
Merge branch 'master' of https://github.com/Uni-Kitty/project3