Merge pull request #1 from estebanav/hackathon-google-maps

Hackathon google maps
- main.js correction
- Grunt Files
Grunt Files
Merge remote-tracking branch 'origin/master'

Conflicts:
	js/main.js
Merge remote-tracking branch 'origin/master' into hackathon-google-maps