added slider test
working on customising markers
fixed merge conflict
finished repairing code after merge- yellow markers and pop up hover now working
pop up now only closes on click outside the map, not end of hover
added slider test
working on customising markers
finished repairing code after merge- yellow markers and pop up hover now working
pop up now only closes on click outside the map, not end of hover
fixed conflicts
Merge pull request #28 from binaryberry/master

markers are now yellow and open on hover