Some changes
Merge branch 'master' of https://github.com/meca1012/ShareYourSpot.git