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
getting recent changes
getting changes
Added map to script
Merge pull request #33 from DanielFarber/master

Created the map