Add png to marker image
Merge branch 'master' of github.com:mlantz/PurpleCarrot into pretty_and_close
Merge pull request #2 from mlantz/pretty_and_close

Add .png to marker icon
Merge branch 'master' into jon

Conflicts:
	index.html