added slider test
working on customising markers
fixed merge conflict
Merge pull request #25 from binaryberry/master

Customised marker icons, and pop ups now open on hover, not just click