parse
Merge branch 'master' of https://github.com/wgraus/kml-parser

Conflicts:
	parsekml.py