gps permissions thing
Merge branch 'master' of https://github.com/mahsu/YoTellMeAStory

Conflicts:
	views/index.ejs
Merge branch 'master' of https://github.com/mahsu/YoTellMeAStory

Conflicts:
	views/index.ejs