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

Map marker
fixed merge conflict
Merge pull request #16 from ieatkimchi/Map_Styling

Map styling
testing redbike
different things, different icons rendered
Testing websocket channel on local network

can send string and have it push to other computer
on same network with no refreash
can now send 'message' and push response
testing websocket channel
Merge pull request #18 from ieatkimchi/map_styling_2

different things, different icons rendered
Merge branch 'master' into ws
Merge pull request #19 from ieatkimchi/ws

Ws
fixed map icons
Changes for mobile
Merge pull request #20 from ieatkimchi/changes_for_mobile

Changes for mobile
fixed image path
Merge branch 'master' of https://github.com/ieatkimchi/Bike-1-1