reads in locations and adds to map as markers
merge conflicts
Merge pull request #23 from bryansills/master

reads in locations and adds to map as markers