YOLOOOOOOOOOO
Merge branch 'master' of https://github.com/mamikfr/mahmoudproject

Conflicts:
	StopBy/custom.js
	StopBy/index.html
	StopBy/searchResult.html
	StopBy/style.css