getting the latest from upstream
merging latest master
merging latest
tweaks to breakpoints to accomodate iPads which are not, and have never been, 640 px wide.
removed a file that's not needed
updating
added map marker
Merge pull request #42 from marcnischan/map-marker

Map marker