Added some markers to Google Maps API
Merge branch 'master' of https://ub.com/brunoflora/elosparaisopolis

Conflicts:
	js/main.js