working on slider toggle
switch toggle working
fixed merge conflicts
Merge pull request #3 from emmack/map

Map