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

Conflicts:
	README.md