working custom marker
changed icon
cleaned up image code
reverted
Merge pull request #17 from ieatkimchi/map_marker

Map marker
fixed merge conflict