Toying with Gmaps4rails
fixed conflicts with JS from previous merge
Toying with Gmaps4rails
fixed conflicts with JS from previous merge
Adds Lat/Long to new Artifacts
fixed uploader and some other things
Adds MapBox API and OpenStreetMap
Popup box styling
fixes string interpolation and zoom on js
Merge branch 'ArtifactMapper' of https://github.com/tonyta/ProjectBernies into ArtifactMapper

Conflicts:
	app/assets/javascripts/artifacts.js
	app/assets/stylesheets/custom.css
	app/controllers/artifacts_controller.rb
	app/controllers/pictures_controller.rb
Merge pull request #14 from tonyta/ArtifactMapper

Artifact mapper