a
a
Merge branch 'master' of https://github.com/esamudio/studypals

Conflicts:
	HTML/map.html