map markers
Merge pull request #14 from cathylill/master

map markers