erreur
Merge branch 'master' of https://github.com/ericluong/pinsolite

Conflicts:
	search.html
Merge branch 'master' of https://github.com/ericluong/pinsolite

Conflicts:
	css/style.css
Around me part 1 : markers + slider (kms), filters not implemented yet
Merge branch 'master' of https://github.com/ericluong/pinsolite

Conflicts:
	css/style.css
update css and file scss