fixed markers are showing up
Generated map/placed multiple pins/refactored
Merge pull request #32 from red-admirals-2014/multi_marker

Multi marker
resolved merge conflicts