hello?
hello?
hmm
hmm
work?
work?
Testing commit status.
Merge remote-tracking branch 'ec2/master'

Conflicts:
	.DS_Store
Another test commit for a deploy.
added bunker hill monument
removing test entry for the moment.
Adding back in monument square.
added faneuil hall
Specifying marker-image in mapbox CSS
Another attempt at specifying a marker style.
Some tweaks to get this working locally.
Custom marker style for Mapbox, removing some unnecessary JS
Removing a test comment.
conflict
fixed conflict