Merge pull request #1 from Tablesalt/gh-pages

Help please update me
Merge pull request #5 from nowen4350/gh-pages

Change for map.js to new map
where did blue dot go
i forget what i did in this commit
messge
Adding main icons
Merge pull request #7 from Stardusty/gh-pages

Adding main icons
 I did some stuff with the database thing so now geolocation works
Implemented the ability to add geolocation the a database.
Merge pull request #8 from harbieism/master

Implemented geolocation
I will commit whether you like it or not
fight me
add jgm ref and meta tags
Merge pull request #9 from jdungan/gh-pages

add jgm ref and meta tags
added popup, modified image folders
Added all of the attributes we were looking for to DBGiver.
added icon, moved leaflet.usermarker
ALL HAIL BLUE DOT
Merge pull request #11 from harbieism/master

Added all of the attributes we were looking for to DBGiver.
Merge pull request #3 from Tablesalt/gh-pages

Grabbing commits