Routine comit
Merge branch 'master' of github.com:WDI-Team-Geodude/piler
Merge branch 'master' of github.com:WDI-Team-Geodude/piler

Conflicts:
	public/javascripts/navscript.js
	public/javascripts/scripts.js
	views/index.erb
Code should be unscrewed, created branch
good copy
Merge pull request #30 from pateltejal9500/master

good copy
getting recent changes
getting changes
Added map to script
styling and close button
Merge pull request #33 from DanielFarber/master

Created the map
googlemapapi script tag
final
Merge pull request #32 from pateltejal9500/master

styling and close button
trying to pull
Merging
Added the README
Merge pull request #34 from DanielFarber/master

The README
Map markers do some things
Merge pull request #35 from DanielFarber/master

Map markers do some things