finished repairing code after merge- yellow markers and pop up hover now working
Merge pull request #26 from binaryberry/master

finished repairing code after merge- yellow markers and pop up hover now...