I thought I did this already
Merge pull request #5 from allknowingfrog/master

Map Creation
Merge pull request #6 from JRonhovde/JO

I thought I did this already....

I thought you did, too.
Merge pull request #1 from thesojourner/master

pull yukon
Merge pull request #8 from RCCAMER/master

Merge pull request #1 from thesojourner/master
Merge pull request #11 from allknowingfrog/master

basically functional
Merge remote-tracking branch 'upstream/master'
login and registration system