Merge pull request #107 from Street-Meet/staging

Staging Rene's last commit
fixed spaces
added basic map
small changes
removed extra line
Merge pull request #108 from TonOfPrince/map

Map