Started getting map working.
Map finally works! Location needs work.
Merge pull request #2 from Xadneil/Daniel_Develop

Daniel develop