Merge pull request #29 from sunny-mittal/nManos

N manos
fixed merge conflicts.
Merge pull request #30 from sunny-mittal/gabe

fixed merge conflicts.
Fix merge conflicts
Merge pull request #31 from sunny-mittal/sunny

Fix merge conflicts
Custom map icon functionality.