Added integration with Geolocation and Google Maps API
Fixed merging conflicts.

Merge remote-tracking branch 'upstream/master' into google-maps-integration

Conflicts:
	app/styles/components/_pages/_splash.scss
	app/styles/components/components.css
Merge pull request #31 from LeonardoBraga/google-maps-integration

Google maps integration
adding an about page
Merge pull request #32 from vazquez/abut-page

adding an about page